gitconfig merge.conflictstyle diff3