[PATCH] update: in the description update() in merge.py, mention the long options explicitly

[Kevin Bullock]

> On Oct 23, 2017, at 16:07, muxator via Mercurial-devel <mercurial-devel at mercurial-scm.org> wrote:
> 
> # HG changeset patch
> # User muxator <a.mux at inwind.it>
> # Date 1507152154 -7200
> #      Wed Oct 04 23:22:34 2017 +0200
> # Branch stable
> # Node ID 83a8eaeba37151821781becdf285501ebf065695
> # Parent  780d13a58b332b3d18595af698eed1190fbe971e
> update: in the description update() in merge.py, mention the long options explicitly
> 
> The short options "-c" and "-C" may be confusing for a novice reading the
> documentation. Let's try to be more explicit, also mentioning the equivalent
> long options ("--check" and "--clean") in the comments.

This looks good, but our usual style in help is to say:

    -c/--check and -C/--clean

instead of having the long options in parentheses. Okay if I update that in-flight?

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock