--- a/tests/test-merge1.t Tue Aug 22 16:58:37 2017 -0400
+++ b/tests/test-merge1.t Tue Aug 22 16:58:43 2017 -0400
@@ -340,9 +340,14 @@
isn't changed on the filesystem (see also issue4583).
$ cat > $TESTTMP/abort.py <<EOF
+ > from __future__ import absolute_import
> # emulate aborting before "recordupdates()". in this case, files
> # are changed without updating dirstate
- > from mercurial import extensions, merge, error
+ > from mercurial import (
+ > error,
+ > extensions,
+ > merge,
+ > )
> def applyupdates(orig, *args, **kwargs):
> orig(*args, **kwargs)
> raise error.Abort('intentional aborting')