[PATCH stable] update: shorten abort message for updating across branches when unclean

[Rafael Villar Burke (Pachi)]

Gilles Moris wrote:
> On Tuesday 01 December 2009 06:34:00 am Henrik Stuart wrote:
>>>                  raise util.Abort(_("crosses branches (use 'hg merge' or use "
>>>                                     "'hg update -c')"))
>>>       
> The use of 'hg up -C' is a fundamental command, but this is not something we
> should ask to use in the first place.
Beware of the option casing, as it is 'c', not 'C'. 'c' is non destructive.

Regards,

Rafael Villar Burke