vimdiff

vim -d  file_1 file_2
vimdiff file_2 file_2

Sometimes (usually when only a single line is modified), vim doesn't automatically update the diffs.

:diffupdate

[c
]c

:diffget
:diffput
do
dp

Thanks to Farhan Ahmed who notified me of a typo on this page.