--- a/mercurial/error.py	Fri Jun 04 20:19:53 2010 -0500
+++ b/mercurial/error.py	Fri Jun 04 20:57:26 2010 -0500
@@ -30,9 +30,15 @@
 class CommandError(Exception):
     """Exception raised on errors in parsing the command line."""
 
-class ConfigError(Exception):
+class Abort(Exception):
+    """Raised if a command needs to print an error and exit."""
+
+class ConfigError(Abort):
     'Exception raised when parsing config files'
 
+class ParseError(Abort):
+    'Exception raised when parsing config files (msg[, pos])'
+
 class RepoError(Exception):
     pass
 
@@ -70,6 +76,3 @@
 
 class SignatureError(Exception):
     pass
-
-class Abort(Exception):
-    """Raised if a command needs to print an error and exit."""