zdiff3

Also written: diff3, merge.conflictStyle

A conflict style, set with `merge.conflictStyle`, that also shows the merge base between `|||||||` and `=======`.