##// END OF EJS Templates
Replace tkmerge with hgmerge...
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-----

File last commit:

r237:4f802588 merge default
r240:737c66b6 default
Show More
filelogentry.tmpl
19 lines | 673 B | application/x-cheetah | CheetahLexer
<table class="parity#parity#" width="100%" cellspacing="0" cellpadding="0">
<tr>
<td align="right" width="15%"><b>#date|age# ago:&nbsp;</b></td>
<td><b><a href="?cmd=changeset;node=#node#">#desc|firstline|escape#</a></b></td</tr>
<tr>
<td align="right">revision #filerev#:&nbsp;</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:&nbsp;</td>
<td>#author|obfuscate#</td></tr>
<tr>
<td align="right">date:&nbsp;</td>
<td>#date|date# (#date|age# ago)</td></tr>
</table>