diff -r 5cef00cdba7f -r 3340efe80803 mercurial/cmdutil.py
--- 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(