Mercurial > hg
comparison tests/test-merge-tools.t @ 40465:1736450cd1df
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.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 31 Oct 2018 19:12:32 +0100 |
parents | 5abc47d4ca6b |
children | 86dfae98a3a2 |
comparison
equal
deleted
inserted
replaced
40464:37e75be0b019 | 40465:1736450cd1df |
---|---|
1 test merge-tools configuration - mostly exercising filemerge.py | 1 test merge-tools configuration - mostly exercising filemerge.py |
2 | 2 |
3 $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test | 3 $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test |
4 $ cat >> $HGRCPATH << EOF | |
5 > [ui] | |
6 > merge= | |
7 > EOF | |
4 $ hg init repo | 8 $ hg init repo |
5 $ cd repo | 9 $ cd repo |
6 | 10 |
7 revision 0 | 11 revision 0 |
8 | 12 |