If you want to have a free no-pain visual diff program in osx, try to install tkdiff brew install tkdiff tkdiff file1 file2