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

r19455:c229a5e7 default
r27031:8be0af32 default
Show More
diffstat.tmpl
8 lines | 341 B | application/x-cheetah | CheetahLexer
<tr>
<td class="diffstat-file"><a href="#l{fileno}.1">{file|escape}</a></td>
<td class="diffstat-total" align="right">{total}</td>
<td class="diffstat-graph">
<span class="diffstat-add" style="width:{addpct}%;">&nbsp;</span>
<span class="diffstat-remove" style="width:{removepct}%;">&nbsp;</span>
</td>
</tr>