Mercurial > hg
changeset 11054:355a7535bcac
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 01 May 2010 16:15:27 +0200 |
| parents | bf7e63fedca1 (current diff) 59d0d715fbfa (diff) |
| children | a869a6a42c9e |
| files | hgext/relink.py mercurial/dispatch.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Thu Apr 29 22:14:14 2010 -0500 +++ b/mercurial/dispatch.py Sat May 01 16:15:27 2010 +0200 @@ -105,8 +105,8 @@ except util.Abort, inst: ui.warn(_("abort: %s\n") % inst) except ImportError, inst: + ui.warn(_("abort: %s!\n") % inst) m = str(inst).split()[-1] - ui.warn(_("abort: could not import module %s!\n") % m) if m in "mpatch bdiff".split(): ui.warn(_("(did you forget to compile extensions?)\n")) elif m in "zlib".split():