vimdiff tool usage notes

vimdiff Keyboard Shortcuts:

do - Get changes from other window into the current window.

dp - Put the changes from current window into the other window.

]c - Jump to the next change.

[c - Jump to the previous change.

Ctrl W + Ctrl W - Switch to the other split window.

:qa to quit all
:qa! to quit all without saving
:wqa save and quit all

Note: 

• If you load up two files in splits (:vs or :sp), you can do :diffthis on each window and achieve a diff of files that were already loaded in buffers
• :diffoff can be used to turn off the diff mode. 

Link: http://amjith.blogspot.in/2008/08/quick-and-dirty-vimdiff-tutorial.html