If I do a diff from emacs, I get something that looks like a patch, and the files are concatenated in one big file. Is there any function that I could use to compare them like in this image? It's much easier to see what's changed.
Ediff works similarly: M-x ediff
http://www.gnu.org/software/emacs/manual/html_mono/ediff.html