diff -r d51c658d3f04 -r 56b2bcea2529 mercurial/help.py
--- a/mercurial/help.py	Mon Oct 05 22:49:24 2015 -0700
+++ b/mercurial/help.py	Thu Oct 08 12:55:45 2015 -0700
@@ -502,7 +502,7 @@
         if not rst:
             msg = _('no matches')
             hint = _('try "hg help" for a list of topics')
-            raise util.Abort(msg, hint=hint)
+            raise error.Abort(msg, hint=hint)
     elif name and name != 'shortlist':
         queries = []
         if unknowncmd:
@@ -525,7 +525,7 @@
             else:
                 msg = _('no such help topic: %s') % name
                 hint = _('try "hg help --keyword %s"') % name
-                raise util.Abort(msg, hint=hint)
+                raise error.Abort(msg, hint=hint)
     else:
         # program name
         if not ui.quiet: