comparison hgext/notify.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 16f8e7d1dd54
children 1e0b94cfba0e 1305ba7dee88
comparison
equal deleted inserted replaced
3868:6033d9f28052 3869:ad6f34c83c3d