##// END OF EJS Templates
merge: hint about using `hg resolve` for resolving conflicts...
merge: hint about using `hg resolve` for resolving conflicts This was suggested by one of our users at Google. Makes sense to me. Differential Revision: https://phab.mercurial-scm.org/D6755

File last commit:

r18526:9409aeaa stable
r43072:7b80ad5a default
Show More
shortlogentry.tmpl
7 lines | 281 B | application/x-cheetah | CheetahLexer
<table class="slogEntry parity{parity}">
<tr>
<td class="age">{date|rfc822date}</td>
<td class="author">{author|person}</td>
<td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td>
</tr>
</table>