On Thu, Dec 2, 2021 at 3:42 AM Bagas Sanjaya [off-list ref] wrote:
On 01/12/21 07.05, Elijah Newren via GitGitGadget wrote:
quoted
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)'.
The omission is clearly intentional. The additional text added to the
hunk just above this one (which you snipped), does a better job of
explaining the differences between the styles than this little blurb
did. Moreover, there is insufficient context at this location in the
documentation for a reader to fully understand the difference between
"merge" and "diff3", and the problem of lack of context becomes worse
with the addition of "zdiff3". So, Elijah's choice to drop this blurb
-- leaving just an enumeration of choices -- and elsewhere provide
comprehensive detail about the differences is quite sensible. The
revised text is improved by the loss of the blurb.