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

r29435:b8ede1f7 default
r40501:1736450c default
Show More
bookmarks.tmpl
6 lines | 163 B | application/x-cheetah | CheetahLexer
{header}
<title>{repo|escape}: bookmarks</title>
<description>{repo|escape} bookmark history</description>
{entries%bookmarkentry}
</channel>
</rss>