Show More
@@ -4773,7 +4773,7 b' def summary(ui, repo, **opts):' | |||||
4773 | s = ' '.join(e.recordtypes) |
|
4773 | s = ' '.join(e.recordtypes) | |
4774 | ui.warn( |
|
4774 | ui.warn( | |
4775 | _('warning: merge state has unsupported record types: %s\n') % s) |
|
4775 | _('warning: merge state has unsupported record types: %s\n') % s) | |
4776 |
unresolved = |
|
4776 | unresolved = [] | |
4777 | else: |
|
4777 | else: | |
4778 | unresolved = list(ms.unresolved()) |
|
4778 | unresolved = list(ms.unresolved()) | |
4779 |
|
4779 |
General Comments 0
You need to be logged in to leave comments.
Login now