view mercurial/templates/paper/filelogentry.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.

 <tr>
  <td class="age">{date|rfc822date}</td>
  <td class="author">{author|person}</td>
  <td class="description">
   <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>
   {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}{rename%filelogrename}
  </td>
 </tr>