view templates/filediff.tmpl @ 2019:ced2d3620f95

add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents f2ebd5251e88
children 46b19175fec6
line wrap: on
line source

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

<div class="buttons">
<a href="?cl=#rev#">changelog</a>
<a href="?tags=">tags</a>
<a href="?cs=#node|short#">changeset</a>
<a href="?f=#filenode|short#;file=#file|urlescape#">file</a>
<a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a>
<a href="?fa=#filenode|short#;file=#file|urlescape#">annotate</a>
<a href="?fd=#node|short#;file=#file|urlescape#;style=raw">raw</a>
</div>

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

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

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

#footer#