Mercurial > public > mercurial-scm > hg

diff mercurial/mergestate.py @ 51686:493034cc3265

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 34e15bbab67c
children 7f0cb9ee0534
line wrap: on
line diff
--- a/mercurial/mergestate.py	Thu Jul 18 12:03:29 2024 +0200
+++ b/mercurial/mergestate.py	Thu Jul 18 12:36:12 2024 +0200
@@ -495,7 +495,6 @@
 
 
 class mergestate(_mergestate_base):
-
     statepathv1 = b'merge/state'
     statepathv2 = b'merge/state2'