# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1448990394 28800
# Node ID ea03b3223611ca44055ae32c8b30b2138b6d3499
# Parent  b5612dbe72a398d5a3c15c1c48a2d44640e72958
shelve: don't reimplement mergestate.unresolved()

diff -r b5612dbe72a3 -r ea03b3223611 hgext/shelve.py
--- 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'"))