Using vimdiff
The vimdiff command runs vim in the diff mode on two, three or four files. It is useful for comparing multiple versions of a file.
Using diff and patch commands
diff is a program for finding differences between files. patch applies the diff output to the original file(s) to get the second.