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

<table class="logEntry parity{parity}">
 <tr>
  <th class="label"><span class="age">{date|rfc822date}</span>:</th>
  <th class="firstline"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></th>
 </tr>
 <tr>
  <th class="revision">revision {filerev}:</th>
  <td class="node">
   <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
   <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(diff)</a>
   <a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(annotate)</a>
  </td>
 </tr>
 {rename%filelogrename}
 <tr>
  <th class="author">author:</th>
  <td class="author">{author|obfuscate}</td>
 </tr>
 <tr>
  <th class="date">date:</th>
  <td class="date">{date|rfc822date}</td>
 </tr>
</table>