# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2022-02-21 18:11:59
# Node ID c17aee610bab037ccb0e07a7d52d8cf5689d8e11
# Parent  3d35e7483602ef7f0e4f546c0acb1f6de648d63a

merge: remove pycompat.iteritems()

Differential Revision: https://phab.mercurial-scm.org/D12332

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -625,9 +625,7 @@ class mergeresult(object):
                     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):