Mac OS FileMerge as git difftool

From a console run:
git config --global --edit


Add the following to the file.

[diff]

tool = opendiff

[merge]

tool = opendiff

[difftool]

prompt = false

[mergetool]

prompt = false