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

[Martin Geisler]

Greg Ward <greg-hg at gerg.ca> writes:

> On Mon, Jun 14, 2010 at 6:06 PM, Martin Geisler <mg at lazybytes.net> wrote:
>> Greg Ward <greg-hg at gerg.ca> writes:
>>
>>> # 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.
> [...]
>> Why do you change the quotes from double to single quotes? I prefre
>> double quotes to begin with, especially when they lets us avoid
>> quoting single quotes.
>
> Because I thought it was the convention. I confess: I did not search
> all the ui output for occurences of recommended hg commands.

Okay, no problem then :-)

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/mercurial/