# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-10 06:37:32
# Node ID fc41f9ffd4a4dd2268bad644e92fb2dc1fa15f40
# Parent  41957e50e109949b8c77aa378ec8c5cdfe2de5ac

test-merge-prompt.t: unset HGMERGE

We're going to test behavior with and without HGMERGE, so disable it for the
test.

diff --git a/tests/test-merge-prompt.t b/tests/test-merge-prompt.t
--- a/tests/test-merge-prompt.t
+++ b/tests/test-merge-prompt.t
@@ -5,6 +5,9 @@ b5605d88dc27: Make ui.prompt repeat on "
 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