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-----
<table class="parity#parity#" width="100%" cellspacing="0" cellpadding="0">
<tr>
<td align="right" width="15%"><b>#date|age# ago: </b></td>
<td><b><a href="?cmd=changeset;node=#node#">#desc|firstline|escape#</a></b></td</tr>
<tr>
<td align="right">revision #filerev#: </td>
<td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filenode#</a>
<a href="?cmd=filediff;file=#file#;node=#node#">(diff)</a>
<a href="?cmd=annotate;file=#file#;filenode=#filenode#">(annotate)</a>
</td></tr>
<tr>
<td align="right">author: </td>
<td>#author|obfuscate#</td></tr>
<tr>
<td align="right">date: </td>
<td>#date|date# (#date|age# ago)</td></tr>
</table>