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

r19905:078ccd78 default
r27031:8be0af32 default
Show More
changelog.tmpl
5 lines | 67 B | application/x-cheetah | CheetahLexer
{header}
# HG changelog
# Node ID {node}
{entries%changelogentry}