Mercurial > hg-stable
diff mercurial/dispatch.py @ 11353:f2b25e8ea6c1
merge: when current branch has 1 or > 2 heads, actually abort.
Currently merge just prints abort-like messages to stderr and then
exits with a misleading status 0 (cleverly disguised as "False").
With this change it raises Abort, just like every other fatal error.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 14 Jun 2010 16:06:52 -0400 |
parents | 713ae78bb583 |
children | 2347513f562a d8d0fc3988ca |