Mercurial > hg > mercurial-crew-with-dirclash
view templates/changelogentry.tmpl @ 275:61d45b0ba8fb
various merge improvements
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
various merge improvements
add -C flag: force update and overwrite local changes
add -m flag: allow merges with conflicts
we no longer do merge by default
and we print a warning message when the merge fails
fix bug in printing merge failure message
fix bug diffing files in 'm' state
manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj
TiNsPIds560S5jgw44eWNto=
=GPXN
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 07 Jun 2005 20:06:05 -0800 |
parents | afe895fcc0d0 |
children | b29219389b00 e5d769afd3ef |
line wrap: on
line source
<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|obfuscate#</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>