Mercurial > hg > mercurial-crew-with-dirclash

view templates/filediff.tmpl @ 254:c03f58e5fd2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unify checkout and resolve into update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 unify checkout and resolve into update This replaces checkout and resolve with a single command: $ hg help co hg update [node] update or merge working directory If there are no outstanding changes in the working directory and there is a linear relationship between the current version and the requested version, the result is the requested version. Otherwise the result is a merge between the contents of the current working directory and the requested version. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed. manifest hash: 513d285d7fb775d0560de49387042a685ea062f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFComS7ywK+sNU5EO8RAmgRAJ96GA6qvHLy0Jp0fzUrR2os2azPuACePsdC YBldZtA7yIuTnV2vIbn7OSE= =QtM/ -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 04 Jun 2005 18:34:35 -0800
parents f918a6fa2572
children b29219389b00 e5d769afd3ef
line wrap: on
line source

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

<div class="buttons">
<a href="?cmd=changelog;rev=#rev#">changelog</a>
<a href="?cmd=tags">tags</a>
<a href="?cmd=changeset;node=#node#">changeset</a>
<a href="?cmd=file;file=#file#;filenode=#filenode#">file</a>
<a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a>
<a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a>
<a href="?cmd=filediff;file=#file#;node=#node#;style=raw">raw</a>
</div>

<h2>#file#</h2>

<table>
<tr>
 <td class="metatag">revision #rev#:</td>
 <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
<tr>
 <td class="metatag">parent #p1rev#:</td>
 <td><a href="?cmd=changeset;node=#p1#">#p1#</a></td></tr>
</table>

<pre>
#diff#
</pre>

#footer#