Replace tkmerge with hgmerge
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Replace tkmerge with hgmerge
hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch.
hg will use hgmerge unless overridden with HGMERGE
manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP
vYI6qlyWKQZ01ObUTAIg92o=
=+mRH
-----END PGP SIGNATURE-----
<div class="parity#parity#">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td align="right" width="15%"><b>#date|age# ago: </b></td>
<td><b>#desc|firstline|escape#</b></td</tr>
<tr>
<td align="right">changeset #rev#: </td>
<td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>
#parent1#
#parent2#
<tr>
<td align="right">author: </td>
<td>#author#</td></tr>
<tr>
<td align="right">date: </td>
<td>#date|date#</td></tr>
<tr>
<td align="right" valign="top"><a href="?cmd=manifest;manifest=#manifest#;path=/">files</a>: </td>
<td>#files#</td></tr>
</table>
</div>