3 ms·For diffs that include the common ancestor, add this to .gitconfig: [merge] conflictStyle = diff3by matvore 6y agoFor diffs that include the common ancestor, add this to .gitconfig: [merge] conflictStyle = diff3