Add directories to /opt/local/bin:/opt/local/sbin:/Users/svasseur/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/Developer/usr/bin + .gitconfig intellij and kaleidsocope as difftool/mergetool