Mercurial > hg > mercurial-crew-with-dirclash
diff hgext/bugzilla.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 | 0897bf8d54c7 |
children | 1e0b94cfba0e |