##// 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 / utils
__init__.py Loading ...
cborutil.py Loading ...
dateutil.py Loading ...
interfaceutil.py Loading ...
procutil.py Loading ...
storageutil.py Loading ...
stringutil.py Loading ...