[git] merge.conflictstyle = diff3