Thanks for the article. I’m also a fan of vimdiff, and I use it to help me merging git branches. Just add the lines


[merge]
tool = vimdiff


Then the command “git mergetool” will pick it up automatically. It’s indeed a productivity booster!

Also I’d recommend the peaksea color scheme for VIM to be used with vimdiff. With peaksea you don’t have to worry about the diff color markup conflicting with the syntax highlighting itself — when is the last time you opened two documents in diff mode only to find text “gone” because the syntax highlight color happens to be the same as diff background color? With peaksea I never had a problem.

You can also configure VIM so that peaksea is only activated in diff mode. To do this, put someting like this in your ~/.vimrc:

if &diff
set t_Co=256
set backgroud=dark
colorscheme peaksea
else
colorscheme YOUR_OTHER_COLOR_SCHEME_OF_CHOICE
endif


Enjoy!