Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/util.py @ 1772:b1a7fd503a29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ae61937c61c5
children 7596611ab3d5 b0f6af327fd4 e4abeafd6eb1
line wrap: on
line diff