[git] Use diff3 conflictstyle