use diff3 conflict style in git config