changeset 51699 | ca7bde5dbafb |
parent 51696 | 7f0cb9ee0534 |
--- 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.