##// 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
16 lines | 489 B | application/x-cheetah | CheetahLexer
<div>
<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
<span class="age">{date|rfc822date}</span>
{desc|strip|firstline|escape|nonempty}
{alltags}
</a>
</div>
<div class="title_text">
<div class="log_link">
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>
</div>
<i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>
</div>
<div class="log_body description">{desc|strip|escape|websub|nonempty}
</div>