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

[Adrian Buehlmann]

On 2012-07-10 11:46, Adrian Buehlmann wrote:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1341913120 -7200
> # Node ID 96d2d632aabf72a9ec0f3b11b367fdd88f8c80b2
> # Parent  f12ff66b41bb2a98312526ba0f906e522bc2b9ea
> update: mention how update can be used to cancel an uncommitted merge
> 
> Plain 'hg help update' now shows:
> 
>   $ hg update

I managed to leave out the 'help' there (should be 'hg help update').

(This is because I use a script "hgm.cmd" I have on PATH here for
calling the hg of my patched clone of the main mercurial repo. And I
didn't copy/paste the call I had in my terminal. So, another fix and
resend cycle.)

>   hg update [-c] [-C] [-d DATE] [[-r] REV]
> 
>   aliases: up, checkout, co
> 
>   update working directory (or switch revisions)