Show More
@@ -2907,10 +2907,9 b' def summary(ui, repo):' | |||||
2907 | st = list(repo.status(unknown=True))[:7] |
|
2907 | st = list(repo.status(unknown=True))[:7] | |
2908 | ms = merge_.mergestate(repo) |
|
2908 | ms = merge_.mergestate(repo) | |
2909 | st.append([f for f in ms if f == 'u']) |
|
2909 | st.append([f for f in ms if f == 'u']) | |
2910 |
labels = [_('%d modified |
|
2910 | labels = [_('%d modified'), _('%d added'), _('%d removed'), | |
2911 | _('%d removed files'), _('%d deleted files'), |
|
2911 | _('%d deleted'), _('%d unknown'), _('%d ignored'), | |
2912 | _('%d unknown files'), _('%d ignored files'), |
|
2912 | _('%d unresolved')] | |
2913 | _('%d unresolved files')] |
|
|||
2914 | t = [] |
|
2913 | t = [] | |
2915 | for s,l in zip(st, labels): |
|
2914 | for s,l in zip(st, labels): | |
2916 | if s: |
|
2915 | if s: |
General Comments 0
You need to be logged in to leave comments.
Login now