Add external diff (vim -d) to .gitconfig