changeset 43104 | 74802979dd9d |
parent 43090 | 1f339b503a40 |
child 43106 | d783f945a701 |
--- a/mercurial/merge.py Sun Oct 06 17:45:05 2019 -0400 +++ b/mercurial/merge.py Sun Oct 06 17:59:15 2019 -0400 @@ -702,7 +702,7 @@ """return counts for updated, merged and removed files in this session""" updated, merged, removed = 0, 0, 0 - for r, action in self._results.itervalues(): + for r, action in pycompat.itervalues(self._results): if r is None: updated += 1 elif r == 0: