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