Show More
@@ -504,6 +504,11 b' class mergestate(object):' | |||||
504 | merged += 1 |
|
504 | merged += 1 | |
505 | return updated, merged, removed |
|
505 | return updated, merged, removed | |
506 |
|
506 | |||
|
507 | def unresolvedcount(self): | |||
|
508 | """get unresolved count for this merge (persistent)""" | |||
|
509 | return len([True for f, entry in self._state.iteritems() | |||
|
510 | if entry[0] == 'u']) | |||
|
511 | ||||
507 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
|
512 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): | |
508 | if f2 is None: |
|
513 | if f2 is None: | |
509 | f2 = f |
|
514 | f2 = f |
General Comments 0
You need to be logged in to leave comments.
Login now