Show More
@@ -444,7 +444,7 b' class mergestate(object):' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now