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

     1

#!/usr/bin/env python

     2

#

     3

     4

import doctest

     5

     6

import mercurial.changelog

     7

# test doctest from changelog

     8

     9

doctest.testmod(mercurial.changelog)

    10