diff -r d51c658d3f04 -r 56b2bcea2529 contrib/simplemerge
--- a/contrib/simplemerge	Mon Oct 05 22:49:24 2015 -0700
+++ b/contrib/simplemerge	Thu Oct 08 12:55:45 2015 -0700
@@ -5,7 +5,7 @@
 
 import sys
 from mercurial.i18n import _
-from mercurial import simplemerge, fancyopts, util, ui
+from mercurial import error, simplemerge, fancyopts, util, ui
 
 options = [('L', 'label', [], _('labels to use on conflict markers')),
            ('a', 'text', None, _('treat all files as text')),
@@ -59,7 +59,7 @@
     sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
     showhelp()
     sys.exit(1)
-except util.Abort, e:
+except error.Abort, e:
     sys.stderr.write("abort: %s\n" % e)
     sys.exit(255)
 except KeyboardInterrupt: