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.
morestatus: simplify check for unresolved merge conflicts
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 28 Aug 2017 14:47:18 -0700
changeset 34001 3340efe80803
parent 34000 5cef00cdba7f
child 34002 2ad028635ccd
morestatus: simplify check for unresolved merge conflicts Differential Revision: https://phab.mercurial-scm.org/D546
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Mon Aug 28 15:06:34 2017 -0700
+++ b/mercurial/cmdutil.py	Mon Aug 28 14:47:18 2017 -0700
@@ -587,7 +587,7 @@
         return
 
     m = scmutil.match(repo[None])
-    unresolvedlist = [f for f in mergestate if m(f) and mergestate[f] == 'u']
+    unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
     if unresolvedlist:
         mergeliststr = '\n'.join(
             ['    %s' % os.path.relpath(
Mercurial