##// END OF EJS Templates
test: also deactivate `ui.merge` when testing merge tool...
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.
Boris Feld -
r40501:1736450c default
Show More
Name Size Modified Last Commit Author
/ mercurial / pure
__init__.py Loading ...
base85.py Loading ...
bdiff.py Loading ...
charencode.py Loading ...
mpatch.py Loading ...
osutil.py Loading ...
parsers.py Loading ...