summary: fix type of empty unresolved list

It was okay because tested as a boolean prior to calling len(), but looked
incorrect.
This commit is contained in:
Yuya Nishihara 2017-07-07 23:13:04 +09:00
parent 12efb6fc0b
commit 17207a3d76

View File

@ -4773,7 +4773,7 @@ def summary(ui, repo, **opts):
s = ' '.join(e.recordtypes) s = ' '.join(e.recordtypes)
ui.warn( ui.warn(
_('warning: merge state has unsupported record types: %s\n') % s) _('warning: merge state has unsupported record types: %s\n') % s)
unresolved = 0 unresolved = []
else: else:
unresolved = list(ms.unresolved()) unresolved = list(ms.unresolved())