test-merge-prompt.t: unset HGMERGE

test-merge-prompt.t: unset HGMERGE

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

--- a/tests/test-merge-prompt.t	Tue Nov 10 23:02:59 2015 +0800
+++ b/tests/test-merge-prompt.t	Mon Nov 09 22:37:32 2015 -0800
@@ -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