Don't use vimdiff by default - use 'git difftool' for that