Mercurial > public > mercurial-scm > hg-stable

diff mercurial/config.py @ 11292:037d910734de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: fix up test-hgrc
author Matt Mackall <mpm@selenic.com>
date Fri, 04 Jun 2010 23:04:31 -0500
parents 2123aad24d56
children 3da456d0c885
line wrap: on
line diff
--- a/mercurial/config.py	Fri Jun 04 23:00:22 2010 -0500
+++ b/mercurial/config.py	Fri Jun 04 23:04:31 2010 -0500
@@ -103,10 +103,9 @@
                     try:
                         include(inc, remap=remap, sections=sections)
                     except IOError, inst:
-                        raise error.ParseError(
-                            _("cannot include %s (%s)")
-                            % (inc, inst.strerror),
-                            msg, "%s:%s" % (src, line))
+                        raise error.ParseError(_("cannot include %s (%s)")
+                                               % (inc, inst.strerror),
+                                               "%s:%s" % (src, line))
                 continue
             if emptyre.match(l):
                 continue