# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1541009552 -3600
# Node ID 1736450cd1df2a5005f705c8bfa522443e6b7a35
# Parent  37e75be0b019e359287de734f5c668736a0e4aa5
test: also deactivate `ui.merge` when testing merge tool

We are about to introduce a default config for `ui.merge`. Since
`test-merge-tools.t` is about testing merge configuration, we need to make sure
it won't interfere.

diff -r 37e75be0b019 -r 1736450cd1df 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