Diff
At a Windows command prompt, enter the commands: git config --global diff.tool bc
git config --global difftool.bc.path "c:/Program Files/Beyond Compare 4/bcomp.exe"
Note: For Git versions older than 2.2 (git --version) replace "bc" with "bc3" in the above instructions.
3-way Merge
At a Windows command prompt, enter the commands: git config --global merge.tool bc
git config --global mergetool.bc.path "c:/Program Files/Beyond Compare 4/bcomp.exe"
Note: For Git versions older than 2.2.0 (git --version) replace "bc" with "bc3" in the above instructions.