# HG changeset patch # User Yuya Nishihara # Date 2017-07-07 14:13:04 # Node ID a339027902c4b3287572be8c608e5007146eb772 # Parent a42369e04aeeff03360dc027a68b43d17f640538 summary: fix type of empty unresolved list It was okay because tested as a boolean prior to calling len(), but looked incorrect. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -4773,7 +4773,7 @@ def summary(ui, repo, **opts): s = ' '.join(e.recordtypes) ui.warn( _('warning: merge state has unsupported record types: %s\n') % s) - unresolved = 0 + unresolved = [] else: unresolved = list(ms.unresolved())