Comparing the contents of files

diff file1 file2 - compare two files

sdiff file1 file2 - side by side comparison

vimdiff file1 file2 - highlight differences in vim

In vim use the following:

CTRL-w w go to next window

:q  - close current window

:qa - close both files

:q!  - quit vim