##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

various merge improvements...
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-----
mpm@selenic.com -
r275:61d45b0b default
Show More
Name Size Modified Last Commit Author
/ mercurial
__init__.py Loading ...
byterange.py Loading ...
commands.py Loading ...
demandload.py Loading ...
fancyopts.py Loading ...
hg.py Loading ...
hgweb.py Loading ...
lock.py Loading ...
mdiff.py Loading ...
mpatch.c Loading ...
revlog.py Loading ...
transaction.py Loading ...
ui.py Loading ...