merge: don't bail on outstanding changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge: don't bail on outstanding changes
With multiple heads, we don't need to worry about the working dir's
uncommitted changes at pull time
manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy
CysB458dNcFuB/vDFhgJr58=
=gG+u
-----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>