--- a/hgext/shelve.py	Mon Nov 23 09:37:12 2015 -0800
+++ b/hgext/shelve.py	Tue Dec 01 09:19:54 2015 -0800
@@ -659,7 +659,7 @@
     with repo.lock():
         checkparents(repo, state)
         ms = merge.mergestate.read(repo)
-        if [f for f in ms if ms[f] == 'u']:
+        if list(ms.unresolved()):
             raise error.Abort(
                 _("unresolved conflicts, can't continue"),
                 hint=_("see 'hg resolve', then 'hg unshelve --continue'"))