diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -33,7 +33,6 @@
     logcmdutil,
     logexchange,
     merge as mergemod,
-    mergestate as mergestatemod,
     narrowspec,
     node,
     phases,
@@ -1165,7 +1164,7 @@
 
 
 def abortmerge(ui, repo):
-    ms = mergestatemod.mergestate.read(repo)
+    ms = repo[None].mergestate()
     if ms.active():
         # there were conflicts
         node = ms.localctx.hex()