diff -r b0a4de6c14f8 -r ca7bde5dbafb tests/test-simplemerge.py --- a/tests/test-simplemerge.py Thu Jul 18 12:03:29 2024 +0200 +++ b/tests/test-simplemerge.py Thu Jul 18 12:36:12 2024 +0200 @@ -24,6 +24,8 @@ from mercurial.utils import stringutil TestCase = unittest.TestCase + + # bzr compatible interface, for the tests class Merge3(simplemerge.Merge3Text): """3-way merge of texts.