# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1147365851 25200
# Node ID 3e4a1a0739c22991e66bd40f421696af4e9410d4
# Parent  fdb699b5e13269aade0a09f5f335dcf41d9db3ed# Parent  2f64cbaa1e92922ddcf38e938c0b1263700bc35e
merge with crew.


diff -r 2f64cbaa1e92 -r 3e4a1a0739c2 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu May 11 09:01:32 2006 -0700
+++ b/mercurial/localrepo.py	Thu May 11 09:44:11 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