# Re: \[PATCH v5 2/2\] update documentation for new zdiff3 conflictStyle

- From: Bagas Sanjaya \<hidden\>
- Date: 2021-12-02 08:42:49 
- List: git
- Page: https://ratatoskr.run/git/2021/12/7913713
- Thread: https://ratatoskr.run/git/2021/06/7891996/t.md

```text
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
```