Mercurial > hg
view templates/filerevision.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 | f918a6fa2572 |
children | 0c4688e9ee5c |
line wrap: on
line source
#header# <title>#repo|escape#:#file#</title> </head> <body> <div class="buttons"> <a href="?cmd=changelog;rev=#rev#">changelog</a> <a href="?cmd=tags">tags</a> <a href="?cmd=changeset;node=#node#">changeset</a> <a href="?cmd=manifest;manifest=#manifest#;path=#path#">manifest</a> <a href="?cmd=filelog;file=#file#;filenode=#filenode#">revisions</a> <a href="?cmd=annotate;file=#file#;filenode=#filenode#">annotate</a> <a href="?cmd=file;file=#file#;filenode=#filenode#;style=raw">raw</a> </div> <h2>#file# (revision #filenode#)</h2> <table> <tr> <td class="metatag">changeset #rev#:</td> <td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr> #parent1# #parent2# <tr> <td class="metatag">manifest:</td> <td><a href="?cmd=manifest;manifest=#manifest#;path=/">#manifest#</a></td></tr> <tr> <td class="metatag">author:</td> <td>#author|obfuscate#</td></tr> <tr> <td class="metatag">date:</td> <td>#date|date# (#date|age# ago)</td></tr> </table> <pre> #text# </pre> #footer#