Alternative merge.conflictStyle values? (other than merge and diff3)

Question

I've recently switched from the default merge to diff3 and find the latter excellent, but couldn't find in documentation a full list of the existing styles, ideally with verbose descriptions.

diff3 seems nice and all, but knowing all tools at your disposal can't hurt, I guess.

Answer 1

There are (currently, as of Git 2.18) only two valid conflict styles: diff3 and merge. This could change in the future, but it has not since Git 1.6.1 (when merge.conflictStyle was introduced). See function git_xmerge_config in xdiff-interface.c.