I usually use KDiff3 when viewing the differences between files and merging stuff together. But from time to time I’ve found vimdiff to be a nice alternative, especially when I’m logged in through SSH on a server. The problem is I don’t use it that often so I tend to forget the key combinations. So instead I listed them here for future reference.
do– diff obtaindp– diff put[c– previous difference]c– next difference:diffupdate– diff update:syntax off– syntax offzo– open folded textzc– close folded text
Original source: http://hack2live.blogspot.nl/2009/02/vimdiff-shortcut-keys.html