Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/keepalive.py @ 3869:ad6f34c83c3d
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 | c4325f0a9b91 |
children | 8520a773a141 |