# HG changeset patch
# User Martin von Zweigbergk <martinv...@google.com>
# Date 1448300232 28800
# Mon Nov 23 09:37:12 2015 -0800
# Node ID 30ac13304e5d0e8b4e68455f18adc058e219db7f
# Parent c5cf385ed9f35169e6d59376e7c3f704ac21d208
summary: don't reimplment mergestate.unresolved()
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
