1. Actually I use vimdiff as difftool and vimdiff with molokai colorscheme to get a nice highlighting as you describe in your question.
  2.  
  3. 1- git config --global diff.tool vimdiff
  4. 2- in vim ":colo molokai"
  5.  
  6. * Molokai @ https://github.com/tomasr/molokai
  7. * Possible auto colorscheme with ~/.vimrc:
  8.  
  9. if &diff
  10.     set background=dark
  11.     colorscheme molokai
  12. endif