From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Thu, 02 Dec 2021 08:42:42 GMT
Subject: Re: [PATCH v5 2/2] update documentation for new zdiff3 conflictStyle
Message-ID: <df70e408-9355-aff7-c6fe-540b5c687865@gmail.com>
In-Reply-To: <409ae2bbd85c20a88347a4e1b8afdddcb7c82e5d.1638317108.git.gitgitgadget@gmail.com>

On 01/12/21 07.05, Elijah Newren via GitGitGadget wrote:
>   	The same as `--merge` option above, but changes the way the
>   	conflicting hunks are presented, overriding the
>   	`merge.conflictStyle` configuration variable.  Possible values are
> -	"merge" (default) and "diff3" (in addition to what is shown by
> -	"merge" style, shows the original contents).
> +	"merge" (default), "diff3", and "zdiff3".
>   

Missing '... (the latter both also shows the original contents)'.

-- 
An old man doll... just what I always wanted! - Clara