[PATCH 2 of 4 V6 STABLE] revert: be more helpful on uncommitted merges

[Matt Mackall]

On Mon, 2011-06-20 at 23:11 -0500, Kevin Bullock wrote:
> # HG changeset patch
> # User Kevin Bullock <kbullock at ringworld.org>
> # Date 1308626671 18000
> # Branch stable
> # Node ID 59f92ee58bc1ff014d11d009ab8e39ae86fb5af7
> # Parent  10a8c14a8fdca3d00fee266b3af949f2bd5d74e5
> revert: be more helpful on uncommitted merges
> 
>  BEFORE:
>    $ hg revert
>    abort: no files or directories specified
>    (use --all to discard all changes)
> 
>  AFTER:
>    $ hg revert
>    abort: no files or directories specified
>    (use --all to discard all changes, or 'hg update -C .' to cancel uncommitted merge)

I think this hint about 'uncommitted merge' should be consistent with
the 'uncommitted' changes. See my comment on patch 3. So I think the
result should be:

(uncommitted merge, use --all to discard all changes or 'hg update -C .'
to cancel the merge)

cancel here might want to be abort.

-- 
Mathematics is the supreme nostalgia of our time.