changeset 40465 | 1736450cd1df |
parent 39707 | 5abc47d4ca6b |
child 40478 | 86dfae98a3a2 |
--- 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