--- a/hgext/shelve.py	Tue Nov 17 13:55:30 2015 -0800
+++ b/hgext/shelve.py	Tue Nov 17 13:56:10 2015 -0800
@@ -531,7 +531,7 @@
     lock = None
     try:
         checkparents(repo, state)
-        ms = merge.mergestate(repo)
+        ms = merge.mergestate.read(repo)
         if [f for f in ms if ms[f] == 'u']:
             raise error.Abort(
                 _("unresolved conflicts, can't continue"),