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

r16773:d490edc7 default
r27031:8be0af32 default
Show More
graphedge.tmpl
1 line | 70 B | application/x-cheetah | CheetahLexer
edge: ({col}, {row}) -> ({nextcol}, {nextrow}) (color {color})