diff -r b3b5ed560283 -r d240ae897ba6 mercurial/commands.py
--- a/mercurial/commands.py	Tue Nov 17 13:56:10 2015 -0800
+++ b/mercurial/commands.py	Tue Nov 17 13:56:46 2015 -0800
@@ -5589,7 +5589,7 @@
 
     if show:
         fm = ui.formatter('resolve', opts)
-        ms = mergemod.mergestate(repo)
+        ms = mergemod.mergestate.read(repo)
         m = scmutil.match(repo[None], pats, opts)
         for f in ms:
             if not m(f):
@@ -5604,7 +5604,7 @@
 
     wlock = repo.wlock()
     try:
-        ms = mergemod.mergestate(repo)
+        ms = mergemod.mergestate.read(repo)
 
         if not (ms.active() or repo.dirstate.p2() != nullid):
             raise error.Abort(