Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
#!/bin/sh
hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status