From http://stackoverflow.com/questions/3338126/how-to-diff-the-same-file-between-two-different-commits-on-the-same-branch
$ git difftool <revision_1>:<file_1> <revision_2>:<file_2>