changeset 48927 | c17aee610bab |
parent 48913 | f254fc73d956 |
child 48946 | 642e31cb55f0 |
--- 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):