Mercurial > hg

diff 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
line wrap: on
line diff
--- 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.