conflictstyle=diff3 for git