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

[Dirkjan Ochtman]

On Tue, Jun 15, 2010 at 16:42, Greg Ward <greg-hg at gerg.ca> wrote:
> Looks like single quotes are winning.  Shall I send a patch to
> normalize on single quotes, despite the ugly escaping:
>
>  ui.note('you should have used \'hg domyjob\'\n')
>
> ?

Sounds good, except use double quotes around the whole string so we
don't need the ugly escaping?

Cheers,

Dirkjan