added vimdiff to gitconfig