Mercurial > public > mercurial-scm > hg

diff tests/test-simplemerge.py @ 51699:ca7bde5dbafb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
black: format the codebase with 23.3.0 The CI has moved to 23.3.0, which is the last version that supports 3.7 at runtime, so we should honor this change. # skip-blame mass-reformating only
author Rapha?l Gom?s <rgomes@octobus.net>
date Thu, 18 Jul 2024 12:36:12 +0200
parents 7f0cb9ee0534
children
line wrap: on
line diff
--- 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.