--- a/tests/test-resolve.t Mon May 18 12:45:45 2020 -0400
+++ b/tests/test-resolve.t Mon May 18 14:59:59 2020 -0400
@@ -92,7 +92,7 @@
$ cat > $TESTTMP/markdriver.py << EOF
> '''mark and unmark files as driver-resolved'''
> from mercurial import (
- > merge,
+ > mergestate,
> pycompat,
> registrar,
> scmutil,
@@ -106,7 +106,7 @@
> wlock = repo.wlock()
> opts = pycompat.byteskwargs(opts)
> try:
- > ms = merge.mergestate.read(repo)
+ > ms = mergestate.mergestate.read(repo)
> m = scmutil.match(repo[None], pats, opts)
> for f in ms:
> if not m(f):