Hmm, ok. Check out vim's `diffthis` and https://github.com/tpope/vim-fugitive https://github.com/tpope/vim-fugitive if you haven't. It sounds like it does the s

Hmm, ok. Check out vim's `diffthis` and https://github.com/tpope/vim-fugitive https://github.com/tpope/vim-fugitive if you haven't. It sounds like it does the same thing. I'm suggesting this because you already use MacVim, so you'd get your familiar buffers and keystrokes, among other things.