Switch to merge conflict resolution via diff3 (showing common ancestor).