Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.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 | a8f7791e3680 |
| children | 98b6c1cad58b |
comparison
equal
deleted
inserted
replaced
| 1771:e22bbca2e82b | 1772:b1a7fd503a29 |
|---|