diff -r d51c658d3f04 -r 56b2bcea2529 mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/simplemerge.py	Thu Oct 08 12:55:45 2015 -0700
@@ -23,6 +23,7 @@
 
 from .i18n import _
 from . import (
+    error,
     mdiff,
     scmutil,
     util,
@@ -361,7 +362,7 @@
             if not opts.get('quiet'):
                 ui.warn(_('warning: %s\n') % msg)
             if not opts.get('text'):
-                raise util.Abort(msg)
+                raise error.Abort(msg)
         return text
 
     mode = opts.get('mode','merge')
@@ -381,13 +382,13 @@
         if len(labels) > 2:
             name_base = labels[2]
         if len(labels) > 3:
-            raise util.Abort(_("can only specify three labels."))
+            raise error.Abort(_("can only specify three labels."))
 
     try:
         localtext = readfile(local)
         basetext = readfile(base)
         othertext = readfile(other)
-    except util.Abort:
+    except error.Abort:
         return 1
 
     local = os.path.realpath(local)