changeset 51696 | 7f0cb9ee0534 |
parent 51686 | 493034cc3265 |
child 51699 | ca7bde5dbafb |
--- a/tests/test-simplemerge.py Mon Jul 22 16:49:38 2024 +0200 +++ b/tests/test-simplemerge.py Tue Jul 23 10:02:46 2024 +0200 @@ -24,8 +24,6 @@ from mercurial.utils import stringutil TestCase = unittest.TestCase - - # bzr compatible interface, for the tests class Merge3(simplemerge.Merge3Text): """3-way merge of texts.