Add diff3 for merge conflicts to show "ours, theirs, original".