Mercurial > hg

comparison tests/test-simplemerge.py @ 51700:7f0cb9ee0534

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backout accidental publication of a large range of revisions I accidentally published 25e7f9dcad0f::bd1483fd7088, this is the inverse.
author Raphaël Gomès <rgomes@octobus.net>
date Tue, 23 Jul 2024 10:02:46 +0200
parents 493034cc3265
children ca7bde5dbafb
comparison
equal deleted inserted replaced
51699:bd1483fd7088 51700:7f0cb9ee0534
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
28
29 # bzr compatible interface, for the tests 27 # bzr compatible interface, for the tests
30 class Merge3(simplemerge.Merge3Text): 28 class Merge3(simplemerge.Merge3Text):
31 """3-way merge of texts. 29 """3-way merge of texts.
32 30
33 Given BASE, OTHER, THIS, tries to produce a combined text 31 Given BASE, OTHER, THIS, tries to produce a combined text