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

r21486:16352b34 default
r27031:8be0af32 default
Show More
filelogentry.tmpl
7 lines | 314 B | application/x-cheetah | CheetahLexer
<item>
<title>{desc|strip|firstline|strip|escape}</title>
<link>{urlbase}{url|urlescape}log{node|short}/{file|urlescape}</link>
<description><![CDATA[{desc|strip|escape|websub|addbreaks|nonempty}]]></description>
<author>{author|obfuscate}</author>
<pubDate>{date|rfc822date}</pubDate>
</item>