vimdiff - Edit two or Three versions of a file with Vim and show differences

Vimdiff starts Vim on two (or three) files. Each file gets its own window. The differences between the files are highlighted.This is a nice way to inspect changes and to move changes from one version to another version of the same file.

Full Story