diff -r bd1483fd7088 -r 7f0cb9ee0534 mercurial/merge.py
--- a/mercurial/merge.py	Mon Jul 22 16:49:38 2024 +0200
+++ b/mercurial/merge.py	Tue Jul 23 10:02:46 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