[PATCH] update: mention how update can be used to cancel an uncommitted merge

[Adrian Buehlmann]

On 2012-07-09 18:02, Adrian Buehlmann wrote:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1341849702 -7200
> # Node ID 8bf70e1237bff68a270fd98a6cc67051ff27e666
> # Parent  5d6cbfa975bf2ad0a7b005287617e91e4c38b7b3
> update: mention how update can be used to cancel an uncommitted merge
> 
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -5717,6 +5717,9 @@
>      3. With the -C/--clean option, uncommitted changes are discarded and
>         the working directory is updated to the requested changeset.
>  
> +    To cancel an uncommitted merge (and lose your changes), use
> +    "hg update --clean .".
> +
>      Use null as the changeset to remove the working directory (like
>      :hg:`clone -U`).

I missed some syntax magic there. I will update and resend.