GIT

Compare files in different branches:

> git diff master:path_to_file my_branch:path_to_file (command line diff)
> git difftool master:path_to_file my_branch:path_to_file (difftool, e.g. kdiff3)