##// END OF EJS Templates
merge: remove pycompat.iteritems()...
Gregory Szorc -
r49782:c17aee61 default
parent child Browse files
Show More
@@ -625,9 +625,7 b' class mergeresult(object):'
625 args, msg = self._actionmapping[a][f]
625 args, msg = self._actionmapping[a][f]
626 yield f, args, msg
626 yield f, args, msg
627 else:
627 else:
628 for f, (args, msg) in pycompat.iteritems(
628 for f, (args, msg) in self._actionmapping[a].items():
629 self._actionmapping[a]
630 ):
631 yield f, args, msg
629 yield f, args, msg
632
630
633 def len(self, actions=None):
631 def len(self, actions=None):
General Comments 0
You need to be logged in to leave comments. Login now