Add three-way-diff calculation.

Can be used to examine conflicts.