Install command line tools: then run this: git config --global diff.tool bc3 git config --global difftool.bc3 trustExitCode true git config --global merge.tool bc3