Vim Enhanced Diff

http://www.vim.org/scripts/script.php?script_id=5121
https://github.com/chrisbra/vim-diff-enhanced