Show More
@@ -567,8 +567,7 b' class mergestate(object):' | |||||
567 |
|
567 | |||
568 | def unresolvedcount(self): |
|
568 | def unresolvedcount(self): | |
569 | """get unresolved count for this merge (persistent)""" |
|
569 | """get unresolved count for this merge (persistent)""" | |
570 | return len([True for f, entry in self._state.iteritems() |
|
570 | return len(list(self.unresolved())) | |
571 | if entry[0] == 'u']) |
|
|||
572 |
|
571 | |||
573 | def actions(self): |
|
572 | def actions(self): | |
574 | """return lists of actions to perform on the dirstate""" |
|
573 | """return lists of actions to perform on the dirstate""" |
General Comments 0
You need to be logged in to leave comments.
Login now