Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/changelog.py @ 1772:b1a7fd503a29
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Tue, 21 Feb 2006 15:48:16 -0600 |
parents | 9d2c2e6b32b5 |
children | 11d12bd6e1dc 74d3f5336b66 |
comparison
equal
deleted
inserted
replaced
1771:e22bbca2e82b | 1772:b1a7fd503a29 |
---|