tests/test-merge-tools.t

--- a/tests/test-merge-tools.t	Wed Oct 31 18:43:56 2018 +0100
+++ b/tests/test-merge-tools.t	Wed Oct 31 19:12:32 2018 +0100
@@ -1,6 +1,10 @@
 test merge-tools configuration - mostly exercising filemerge.py
 
   $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
+  $ cat >> $HGRCPATH << EOF
+  > [ui]
+  > merge=
+  > EOF
   $ hg init repo
   $ cd repo