##// 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
bookmarkentry.tmpl
6 lines | 228 B | application/x-cheetah | CheetahLexer
Yuya Nishihara
hgweb: add missing bookmarks templates to atom/rss styles...
r13858 <item>
<title>{bookmark|escape}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link>{urlbase}{url|urlescape}rev/{node|short}</link>
Yuya Nishihara
hgweb: add missing bookmarks templates to atom/rss styles...
r13858 <description><![CDATA[{bookmark|strip|escape|addbreaks}]]></description>
<pubDate>{date|rfc822date}</pubDate>
</item>