view templates/filelogentry.tmpl @ 6206:0b6f12495276

fetch: switch the default parent used for a merge

This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.

The prior default behaviour is still available, via the --switch-parent
option.

<table class="logEntry parity#parity#">
 <tr>
  <th class="age">#date|age# ago:</th>
  <th class="firstline"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#desc|strip|firstline|escape#</a></th>
 </tr>
 <tr>
  <th class="revision">revision #filerev#:</td>
  <td class="node">
   <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a>
   <a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">(diff)</a>
   <a href="#url#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|date#</td>
 </tr>
</table>