Mercurial > hg

view templates/filediff.tmpl @ 415:c2b9502a4e96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> If an "hg update" is attempted across branches, it is aborted with an error message, basically saying that "update -m" is required. Don't prompt the user for "keep vs delete" kinds of questions before deciding to abort. manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE RF5czx2UQ2pSIP119xzq9mQ= =Akj6 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 19:14:11 -0800
parents e5d769afd3ef
children c7364b985ca2
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|short#</a></td></tr>
<tr>
 <td class="metatag">parent #p1rev#:</td>
 <td><a href="?cmd=changeset;node=#p1#">#p1|short#</a></td></tr>
</table>

<pre>
#diff#
</pre>

#footer#