Add git alias for showing a diff of conflicts