Update OS X .gitconfig to use DiffMerge for difftool