In the category of "How did I live without this?!" tools, I'm late to the party with this vim plugin from Brian Shire of Facebook / APC / PHP fame:
If you use svn, git, cvs or similar, this plugin shows you a "diff" in vim.
I don't know how often I quit vi or open another shell just to do a diff.
Now, I don't have to!