diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -16,7 +16,6 @@
     error,
     filesetlang,
     match as matchmod,
-    mergestate as mergestatemod,
     pycompat,
     registrar,
     scmutil,
@@ -245,7 +244,7 @@
     getargs(x, 0, 0, _(b"resolved takes no arguments"))
     if mctx.ctx.rev() is not None:
         return mctx.never()
-    ms = mergestatemod.mergestate.read(mctx.ctx.repo())
+    ms = mctx.ctx.mergestate()
     return mctx.predicate(
         lambda f: f in ms and ms[f] == b'r', predrepr=b'resolved'
     )
@@ -259,7 +258,7 @@
     getargs(x, 0, 0, _(b"unresolved takes no arguments"))
     if mctx.ctx.rev() is not None:
         return mctx.never()
-    ms = mergestatemod.mergestate.read(mctx.ctx.repo())
+    ms = mctx.ctx.mergestate()
     return mctx.predicate(
         lambda f: f in ms and ms[f] == b'u', predrepr=b'unresolved'
     )