Seeing the ancestor tells Git which side changed a line. merge.conflictStyle = zdiff3 prints the ancestor text inside conflicts.
Three-way merge
Merge that compares two branch tips against their common ancestor.
Seeing the ancestor tells Git which side changed a line. merge.conflictStyle = zdiff3 prints the ancestor text inside conflicts.