# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2015-12-01 17:26:10
# Node ID b4d517d736a18f0b6d6d06cd82065bdd5d1bc2b0
# Parent  69c4493a54f9811233204613095849985ee021f8

mergestate: make unresolved() use iteritems()

mergestate.unresolved() is a generator, so it seems better for it to
rely on iteritems() than items(), although it also seems unlikely for
it to make a noticeable difference.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -444,7 +444,7 @@ class mergestate(object):
     def unresolved(self):
         """Obtain the paths of unresolved files."""
 
-        for f, entry in self._state.items():
+        for f, entry in self._state.iteritems():
             if entry[0] == 'u':
                 yield f