--- a/tests/test-dirstate.t Mon May 18 12:45:45 2020 -0400
+++ b/tests/test-dirstate.t Mon May 18 14:59:59 2020 -0400
@@ -70,14 +70,15 @@
> from mercurial import (
> error,
> extensions,
- > merge,
+ > mergestate as mergestatemod,
> )
>
> def wraprecordupdates(*args):
> raise error.Abort("simulated error while recording dirstateupdates")
>
> def reposetup(ui, repo):
- > extensions.wrapfunction(merge, 'recordupdates', wraprecordupdates)
+ > extensions.wrapfunction(mergestatemod, 'recordupdates',
+ > wraprecordupdates)
> EOF
$ hg rm a