##// END OF EJS Templates
merge: move conversion of file-key dict to action-key dict in mergeresult...
merge: move conversion of file-key dict to action-key dict in mergeresult Initially the actions dict which we get has file has keys, but later we want a dict which has actions as keys. This patch moves code computing that to mergeresult class as that's where it should be anyway. Differential Revision: https://phab.mercurial-scm.org/D8817

File last commit:

r35052:e9a8a941 default
r45836:f4a2b329 default
Show More
changelogentry.tmpl
11 lines | 467 B | application/x-cheetah | CheetahLexer
<h3 class="changelog">
<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
{desc|strip|firstline|escape|nonempty}
{alltags}
</a>
</h3>
<ul class="changelog-entry">
<li class="age">{date|rfc822date}</li>
<li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li>
<li class="description">{desc|strip|escape|websub|addbreaks|nonempty}</li>
</ul>