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

     1

#!/bin/sh

     2

     3

hg init

     4

hg log

     5

hg grep wah

     6

hg manifest

     7

hg verify