Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3869:ad6f34c83c3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 11 Dec 2006 18:09:52 +0100
parents 46abbed02b2d
children c0a12e6441a5
comparison
equal deleted inserted replaced
3868:6033d9f28052 3869:ad6f34c83c3d