diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -224,7 +224,6 @@
     hg,
     logcmdutil,
     merge as mergemod,
-    mergestate as mergestatemod,
     mergeutil,
     node,
     obsolete,
@@ -2290,7 +2289,7 @@
 def bootstrapcontinue(ui, state, opts):
     repo = state.repo
 
-    ms = mergestatemod.mergestate.read(repo)
+    ms = repo[None].mergestate()
     mergeutil.checkunresolved(ms)
 
     if state.actions: