view templates/filediff.tmpl @ 3311:966632304dde

merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 01:16:06 -0500
parents 46188b9528ca
children ce8f31e0b3b8
line wrap: on
line source

#header#
<title>#repo|escape#: #file|escape# diff</title>
</head>
<body>

<div class="buttons">
<a href="#url#log/#rev#{getentries}">changelog</a>
<a href="#url#shortlog/#rev#{getentries}">shortlog</a>
<a href="#url#tags{getentries}">tags</a>
<a href="#url#rev/#node|short#{getentries}">changeset</a>
<a href="#url#file/#node|short#/#file|urlescape#{getentries}">file</a>
<a href="#url#log/#node|short#/#file|urlescape#{getentries}">revisions</a>
<a href="#url#annotate/#node|short#/#file|urlescape#{getentries}">annotate</a>
<a href="#url#raw-diff/#node|short#/#file|urlescape#">raw</a>
</div>

<h2>#file|escape#</h2>

<table id="filediffEntry">
<tr>
 <th class="revision">revision #rev#:</th>
 <td class="revision"><a href="#url#rev/#node|short#{getentries}">#node|short#</a></td>
</tr>
#parent%filediffparent#
#child%filediffchild#
</table>

<div id="fileDiff">
#diff#
</div>

#footer#