I always want to jump from the diff to the corresponding line in the original file. So I wrote a small script that does that, and put it in .vim/after/ftplugin/diff.vim Pressing Enter will execute that script. For the reverse operation (get a diff for the current buffer), see VimTip1030.