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

r18045:add2f9dd default
r40501:1736450c default
Show More
branches.tmpl
6 lines | 158 B | application/x-cheetah | CheetahLexer
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 {header}
<title>{repo|escape}: branches</title>
<description>{repo|escape} branch history</description>
{entries%branchentry}
</channel>
</rss>