Diff

Show differences in text files.

diff

Show side by side comparison:
diff -y <filename1> <filename2>

Show unified diff (git-style):
diff -bu <filename1> <filename2>

Save a patch for applying:
diff -bu <filename1> <filename2> > <patchfilename>

Apply patch:
patch <filename> < <patchfilename>