The diff utility is widely used by programmers on linux for comparing file changes, but there are some handy, lesser-known comparison utilities that are more visual and still included for free with linux distros and Mac OS X:
- sdiff is a text-mode side-by-side diff and merge utility. It has -B and -W options for special handling of blank lines and whitespace.
- vimdiff lets you visually compare and edit up to 3 files in color using the vim engine.
Note: diff3 works like diff, but lets you compare and merge 3 files.