changeset 33312 | b5612dbe72a3 |
parent 33117 | a5e1393f61a2 |
child 33360 | 4a70985805c6 |
--- a/mercurial/commands.py Tue Dec 01 09:26:33 2015 -0800 +++ b/mercurial/commands.py Mon Nov 23 09:37:12 2015 -0800 @@ -4776,7 +4776,7 @@ _('warning: merge state has unsupported record types: %s\n') % s) unresolved = 0 else: - unresolved = [f for f in ms if ms[f] == 'u'] + unresolved = list(ms.unresolved()) for p in parents: # label with log.changeset (instead of log.parent) since this