tests/test-merge1.t

--- a/tests/test-merge1.t	Mon Oct 05 22:49:24 2015 -0700
+++ b/tests/test-merge1.t	Thu Oct 08 12:55:45 2015 -0700
@@ -214,10 +214,10 @@
   $ cat > $TESTTMP/abort.py <<EOF
   > # emulate aborting before "recordupdates()". in this case, files
   > # are changed without updating dirstate
-  > from mercurial import extensions, merge, util
+  > from mercurial import extensions, merge, error
   > def applyupdates(orig, *args, **kwargs):
   >     orig(*args, **kwargs)
-  >     raise util.Abort('intentional aborting')
+  >     raise error.Abort('intentional aborting')
   > def extsetup(ui):
   >     extensions.wrapfunction(merge, "applyupdates", applyupdates)
   > EOF