Update git merge/diff tools.
Add /usr/local/bin to $PATH. Whitespace.