Commit 547f8f64 authored by Eric Blake's avatar Eric Blake Committed by Laurent Vivier
Browse files

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



Prefer a consistent naming for the --merge argument.

Fixes: 3b51ab4b
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200529144527.1943527-1-eblake@redhat.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent d263425b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ Command description:

  ``--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
  *GRANULARITY* for ``--add``, and ``-b`` and ``-F`` which select an