vimdiff Tutorial

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

• 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.