Mercurial > hg > mercurial-crew-with-dirclash
view templates/filediff.tmpl @ 232:fc4a6e5b5812
hg resolve: merge a given node into the working directory
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg resolve: merge a given node into the working directory
This is the first pass at working directory-based merges. Doing a
resolve adds a second parent to the working directory state for the
next commit.
manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC
kkfoAxX2E5jkuOeSJ1Hjalk=
=bdrT
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:58:47 -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#