vimdiff
Currently I’m checking out some nice features of vim for my workshop at GLT04. By accident I found this short but informative webpage about vimdiff. Of course I kn[e|o]w vimdiff, but the following hints were quite useful at least for me:
Re-diffing :diffupdate Moving between diffs [c ]c Synchronizing :diffget :diffput
Especially diffget und diffput are quity handy. And I still don’t understand why there doesn’t exist a reference to ‘vim -c “:he vimdiff”‘ in ‘man 1 vimdiff’