Mercurial > hg > mercurial-crew-with-dirclash
view PKG-INFO @ 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 | 9117c6561b0b |
children | 20fc66131bc0 |
line wrap: on
line source
Metadata-Version: 1.0 Name: mercurial Version: 0.4c Summary: scalable distributed SCM Home-page: http://selenic.com/mercurial Author: Matt Mackall Author-email: mpm@selenic.com License: GNU GPL Description: UNKNOWN Platform: UNKNOWN