add xquartz, meld
use include file and meld use it as difftool
Merge branch 'master' of github.com:taketin/dotfiles