view mercurial/templates/monoblue/changelogentry.tmpl @ 26572:c7850af6bb75

filemerge._merge: drop no longer necessary 'if r:' check

Cleanup from an earlier patch to make premerge be directly called from the main
filemerge function.

<h3 class="changelog"><a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></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>