Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 3351:50a18815e3f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Tue, 10 Oct 2006 21:03:24 +0300
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3324:34f08b8883cf 3351:50a18815e3f0