changeset 18932 | 7b4b9e8ea12e |
parent 18758 | 6aca4d1c744e |
child 18935 | e5d9441ec281 |
--- a/mercurial/dispatch.py Fri Feb 08 14:26:03 2013 -0600 +++ b/mercurial/dispatch.py Fri Feb 08 16:28:24 2013 -0600 @@ -151,6 +151,8 @@ commands.help_(ui, inst.args[0], unknowncmd=True) except error.UnknownCommand: commands.help_(ui, 'shortlist') + except error.InterventionRequired, inst: + ui.warn("%s\n" % inst) except util.Abort, inst: ui.warn(_("abort: %s\n") % inst) if inst.hint: