Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 51749: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 e60f9168263c
children 7f0cb9ee0534
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Jul 18 12:03:29 2024 +0200
+++ b/mercurial/merge.py	Thu Jul 18 12:36:12 2024 +0200
@@ -420,11 +420,11 @@
     # Track the names of all deleted files.
     for f in mresult.files((mergestatemod.ACTION_REMOVE,)):
         deletedfiles.add(f)
-    for (f, args, msg) in mresult.getactions((mergestatemod.ACTION_MERGE,)):
+    for f, args, msg in mresult.getactions((mergestatemod.ACTION_MERGE,)):
         f1, f2, fa, move, anc = args
         if move:
             deletedfiles.add(f1)
-    for (f, args, msg) in mresult.getactions(
+    for f, args, msg in mresult.getactions(
         (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,)
     ):
         f2, flags = args