I followed this site to install Vimdiff. I typed the following commands:
git difftool --tool=vimdiff --no-prompt git config --global diff.tool vimdiff git config