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

r18526:9409aeaa stable
r40501:1736450c default
Show More
branchentry.tmpl
6 lines | 224 B | application/x-cheetah | CheetahLexer
<item>
<title>{branch|escape}</title>
<link>{urlbase}{url|urlescape}rev/{node|short}</link>
<description><![CDATA[{branch|strip|escape|addbreaks}]]></description>
<pubDate>{date|rfc822date}</pubDate>
</item>