.gitconfig: set merge.conflictstyle = diff3