22 )

    22 )

    23 

    23 

    24 from mercurial.utils import stringutil

    24 from mercurial.utils import stringutil

    25 

    25 

    26 TestCase = unittest.TestCase

    26 TestCase = unittest.TestCase

    27 # bzr compatible interface, for the tests

    29 # bzr compatible interface, for the tests

    28 class Merge3(simplemerge.Merge3Text):

    30 class Merge3(simplemerge.Merge3Text):

    29     """3-way merge of texts.

    31     """3-way merge of texts.

    30 

    32 

    31     Given BASE, OTHER, THIS, tries to produce a combined text

    33     Given BASE, OTHER, THIS, tries to produce a combined text