Mercurial > hg > mercurial-source

changeset 27535:fc41f9ffd4a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-prompt.t: unset HGMERGE We're going to test behavior with and without HGMERGE, so disable it for the test.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 09 Nov 2015 22:37:32 -0800
parents 41957e50e109
children 5e46123e6c35
files tests/test-merge-prompt.t
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge-prompt.t
+++ b/tests/test-merge-prompt.t
@@ -5,6 +5,9 @@
 840e2b315c1f: Fix misleading error and prompts during update/merge
  (issue556)
 
+Make sure HGMERGE doesn't interfere with the test
+  $ unset HGMERGE
+
   $ status() {
   >     echo "--- status ---"
   >     hg st -A file1 file2