Use vimdiff as the git diff tool.
Merge branch 'master' of https://github.com/amagdas/dotFiles