qemu-img: Fix doc typo for 'bitmap' subcommand

Prefer a consistent naming for the --merge argument.

Fixes: 3b51ab4bf
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200529144527.1943527-1-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
Eric Blake 2020-05-29 09:45:27 -05:00
parent 31d321c2b3
commit 1d74594065

View File

@ -300,7 +300,7 @@ Command description:
``--disable`` to change *BITMAP* to stop recording future edits. ``--disable`` to change *BITMAP* to stop recording future edits.
``--merge`` to merge the contents of *SOURCE_BITMAP* into *BITMAP*. ``--merge`` to merge the contents of the *SOURCE* bitmap into *BITMAP*.
Additional options include ``-g`` which sets a non-default Additional options include ``-g`` which sets a non-default
*GRANULARITY* for ``--add``, and ``-b`` and ``-F`` which select an *GRANULARITY* for ``--add``, and ``-b`` and ``-F`` which select an