diff3 shows differences among three files.
When two people have made independent changes to a common
original, diff3 can report the differences between the
original and the two changed versions, and can produce a
merged file that contains both persons' changes together
with warnings about conflicts.