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-----
#header#
<title>#repo|escape#: changelog</title>
</head>
<body>
<div class="buttons">
<a href="?cmd=tags">tags</a>
<a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a>
</div>
<h2>changelog for #repo|escape#</h2>
<form>
search:
<input type="hidden" name="cmd" value="changelog">
<input name="rev" type="text" width="30">
navigate: <small>#changenav#</small><br/>
</form>
#entries#
<form>
search:
<input type="hidden" name="cmd" value="changelog">
<input name="rev" type="text" width="30">
navigate: <small>#changenav#</small><br/>
</form>
#footer#