Commits

Martin Geisler committed 355a753 Merge

Merge with stable

  • Participants
  • Parent commits bf7e63f, 59d0d71

Comments (0)

Files changed (2)

File hgext/relink.py

File contents unchanged.

File mercurial/dispatch.py

     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():