setting conflictstyle to diff3 for git