diff mercurial/dispatch.py @ 9567:02c43e8e0835

Merge with hg-i18n-stable
author Martin Geisler <mg@lazybytes.net>
date Wed, 30 Sep 2009 21:14:24 +0200
parents 96379c93ba6f ba75830d17a9
children ceb0f59e1327
line wrap: on
line diff
--- a/mercurial/dispatch.py	Tue Sep 29 00:54:15 2009 +0200
+++ b/mercurial/dispatch.py	Wed Sep 30 21:14:24 2009 +0200
@@ -24,6 +24,9 @@
     except util.Abort, inst:
         sys.stderr.write(_("abort: %s\n") % inst)
         return -1
+    except error.ConfigError, inst:
+        sys.stderr.write(_("hg: %s\n") % inst)
+        return -1
     return _runcatch(u, args)
 
 def _runcatch(ui, args):