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
