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

Content-type: text/plain; charset={encoding}