Set vimdiff as merge.tool in gitconfig.