##// END OF EJS Templates
mergestate: allow storing and retrieving change/delete conflicts...
mergestate: allow storing and retrieving change/delete conflicts We introduce a new record type, 'C', to indicate change/delete conflicts. This is a separate record type because older versions of Mercurial will not be able to handle these conflicts. We aren't actually storing any change/delete conflicts yet -- that will come in future patches.

File last commit:

r18526:9409aeaa stable
r27031:8be0af32 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>