[PATCH] merge: when current branch has 1 or > 2 heads, actually abort

[Matt Mackall]

On Mon, 2010-06-14 at 16:07 -0400, Greg Ward wrote:
> # HG changeset patch
> # User Greg Ward <greg-hg at gerg.ca>
> # Date 1276546012 14400
> # Node ID 7422ede2bda7c8a786c4f0d1f1e5138219423b95
> # Parent  c6971a790206f824df9b25607fa4d030baad92fd
> 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.

Queued, thanks.

-- 
Mathematics is the supreme nostalgia of our time.