mercurial/merge.py
changeset 33310 b4d517d736a1
parent 33283 634b259079c5
child 33311 f8f716da90fa
equal deleted inserted replaced
33309:69c4493a54f9 33310:b4d517d736a1
   442         return self._mdstate
   442         return self._mdstate
   443 
   443 
   444     def unresolved(self):
   444     def unresolved(self):
   445         """Obtain the paths of unresolved files."""
   445         """Obtain the paths of unresolved files."""
   446 
   446 
   447         for f, entry in self._state.items():
   447         for f, entry in self._state.iteritems():
   448             if entry[0] == 'u':
   448             if entry[0] == 'u':
   449                 yield f
   449                 yield f
   450 
   450 
   451     def driverresolved(self):
   451     def driverresolved(self):
   452         """Obtain the paths of driver-resolved files."""
   452         """Obtain the paths of driver-resolved files."""