This tutorial has moved to curious submodules.
Two and three dots with diff
Using vim as a mergetool in git