##// 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.

File last commit:

r30346:9cc438bf default
r40501:1736450c default
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer