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

#!/bin/sh

hg init a
cd a
hg -v log -v
hg -v log -v x
true