##// END OF EJS Templates
tests: make merge conflicts explicit in `hg annotate` tests...
tests: make merge conflicts explicit in `hg annotate` tests We were using `true` as merge tool. I think it makes the test easier to understand if we make the conflicts explcit. It also papered over a conflict that shouldn't have been a conflict (just a bug in copy tracing). I've marked that "BROKEN". Differential Revision: https://phab.mercurial-scm.org/D6252

File last commit:

r30558:7817df55 stable
r42327:7116fc61 default
Show More
filelogentry.tmpl
7 lines | 315 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <item>
<title>{desc|strip|firstline|strip|escape}</title>
av6
hgweb: add missing slash to file log url in rss style
r30558 <link>{urlbase}{url|urlescape}log/{node|short}/{file|urlescape}</link>
Steven Brown
hgweb: apply websub filter to the changeset description in rss and atom feeds...
r21486 <description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <author>{author|obfuscate}</author>
<pubDate>{date|rfc822date}</pubDate>
</item>