diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5961,7 +5961,7 @@
     if show:
         ui.pager(b'resolve')
         fm = ui.formatter(b'resolve', opts)
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
         wctx = repo[None]
         m = scmutil.match(wctx, pats, opts)
 
@@ -5998,7 +5998,7 @@
         return 0
 
     with repo.wlock():
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
 
         if not (ms.active() or repo.dirstate.p2() != nullid):
             raise error.Abort(
@@ -6908,7 +6908,7 @@
     marks = []
 
     try:
-        ms = mergestatemod.mergestate.read(repo)
+        ms = repo[None].mergestate()
     except error.UnsupportedMergeRecords as e:
         s = b' '.join(e.recordtypes)
         ui.warn(