author | Vadim Gelfer <vadim.gelfer@gmail.com> |
Thu, 11 May 2006 09:43:50 -0700 | |
changeset 2264 | fdb699b5e132 |
parent 2262 | 3d48eb68f3ee |
child 2265 | 3e4a1a0739c2 |
--- a/mercurial/localrepo.py Thu May 11 08:48:52 2006 -0700 +++ b/mercurial/localrepo.py Thu May 11 09:43:50 2006 -0700 @@ -1564,8 +1564,7 @@ moddirstate=True, forcemerge=False, wlock=None, show_stats=True): pl = self.dirstate.parents() if not force and pl[1] != nullid: - self.ui.warn(_("aborting: outstanding uncommitted merges\n")) - return 1 + raise util.Abort(_("outstanding uncommitted merges")) err = False