# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1448990770 28800
# 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 -r 69c4493a54f9 -r b4d517d736a1 mercurial/merge.py
--- a/mercurial/merge.py	Fri Jun 30 23:58:59 2017 -0700
+++ b/mercurial/merge.py	Tue Dec 01 09:26:10 2015 -0800
@@ -444,7 +444,7 @@
     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