git

Git Diff with VImdiffu

http://technotales.wordpress.com/2009/05/17/git-diff-with-vimdiff/