[PATCH] revert: be more helpful on uncommitted merges

[Martin Geisler]

Kevin Bullock <kbullock+mercurial at ringworld.org> writes:

> On Jun 22, 2011, at 9:05 AM, Adrian Buehlmann wrote:
>
>> +        if p2 != nullid:
>> +            hint = _("uncommitted merge, use --all to discard all changes,"
>> +                     " or 'hg update -C .' to abort the merge")
>
> Do we want an explicit newline in there somewhere? Do we do that with
> any other long hints?

We don't wrap the hints -- long-term, I would like to use minirst to
render such messages and then it will take care of breaking the lines.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://mercurial.aragost.com/kick-start/