Put Homebrew path before /usr/bin
Use diffmerge for Git mergetool