For the conflicts, note that in Git you can do

    git config --global merge.conflictstyle diff3

to get something like what is shown in the article.