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

r24588:0bf54479 default
r40501:1736450c default
Show More
changelist.tmpl
5 lines | 124 B | application/x-cheetah | CheetahLexer
\{
"node": {node|json},
"changeset_count": {changesets|json},
"changesets": [{join(entries%changelistentry, ", ")}]
}