Git: diff3 conflict style on merges.