Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: don't reimplment mergestate.unresolved()
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 23 Nov 2015 09:37:12 -0800
changeset 33312 b5612dbe72a3
parent 33311 f8f716da90fa
child 33313 ea03b3223611
summary: don't reimplment mergestate.unresolved()
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial