(via www.debianadmin.com)
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.