diff -r b0a4de6c14f8 -r ca7bde5dbafb mercurial/merge.py --- 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