Mercurial > hg-stable
changeset 33413:a339027902c4
summary: fix type of empty unresolved list
It was okay because tested as a boolean prior to calling len(), but looked
incorrect.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Fri, 07 Jul 2017 23:13:04 +0900 |
| parents | a42369e04aee |
| children | 16ed67164002 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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())