[PATCH 2 of 2] update: add --abort flag to abort in case of conflicts

[Laurent Charignon]

> On Dec 2, 2015, at 6:00 PM, Matt Mackall <mpm at selenic.com> wrote:
> 
> On Wed, 2015-12-02 at 16:41 -0800, Laurent Charignon wrote:
>> # HG changeset patch
>> # User Laurent Charignon <lcharignon at fb.com>
>> # Date 1449103296 28800
>> #      Wed Dec 02 16:41:36 2015 -0800
>> # Node ID d3966bce263b1df5f600679926827d1a52590eb9
>> # Parent  8d5a092b64d9ddb7f6481bfe16aaeb6a7dab5951
>> update: add --abort flag to abort in case of conflicts
> 
> This is not a particularly good match for how --abort works elsewhere.
> For instance, rebase --abort can be run -after- a rebase command to
> clean-up. And that's a more desirable sort of behavior than having to
> remember in advance that update might make a mess and add an option.
> 
> So I think we should save the --abort flag on update for a separate
> command to clean up an update with conflicts (or perhaps other forms of
> interrupted update).

Agreed, that it is a clumsy naming. 
Let's save the --abort flag on update for cleanup.
How else could update be interrupted besides conflicts?

> 
> -- 
> Mathematics is the supreme nostalgia of our time.
>