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

r9999:f91e5630 default
r40501:1736450c default
Show More
filediff.tmpl
5 lines | 27 B | application/x-cheetah | CheetahLexer
{header}
{diff}
{footer}