changeset 33413 | a339027902c4 |
parent 33360 | 4a70985805c6 |
child 33499 | 0407a51b9d8c |
--- a/mercurial/commands.py Fri Jul 07 23:40:00 2017 +0900 +++ b/mercurial/commands.py Fri Jul 07 23:13:04 2017 +0900 @@ -4773,7 +4773,7 @@ s = ' '.join(e.recordtypes) ui.warn( _('warning: merge state has unsupported record types: %s\n') % s) - unresolved = 0 + unresolved = [] else: unresolved = list(ms.unresolved())