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.
changeset: 0:9426b370c206
tag: tip
user: My Name <myname@example.com>
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-1
changeset: 1:4997f15a1b24
tag: tip
user: foo@bar.com
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-1
changeset: 2:72b8012b424e
tag: tip
user: foobar <foo@bar.com>
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-1
changeset: 3:35ff3067bedd
tag: tip
user: foo@bar.com
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-1
abort: no username supplied (see "hg help config")
No username found, using user@host instead
transaction abort!
rollback completed
abort: empty username!