Mercurial > hg

diff mercurial/merge.py @ 48927:c17aee610bab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove pycompat.iteritems() Differential Revision: https://phab.mercurial-scm.org/D12332
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 21 Feb 2022 11:11:59 -0700
parents f254fc73d956
children 642e31cb55f0
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Feb 21 11:11:27 2022 -0700
+++ b/mercurial/merge.py	Mon Feb 21 11:11:59 2022 -0700
@@ -625,9 +625,7 @@
                     args, msg = self._actionmapping[a][f]
                     yield f, args, msg
             else:
-                for f, (args, msg) in pycompat.iteritems(
-                    self._actionmapping[a]
-                ):
+                for f, (args, msg) in self._actionmapping[a].items():
                     yield f, args, msg
 
     def len(self, actions=None):