Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

#header#
# HG changeset patch
# User #author#
# Date #date|hgdate#
# Node ID #node#
#parent%changesetparent#
#desc#

#diff#