git log -p should use --cc too for merge conflicts.