Use BEYONGD compare as the diff and merge tool for Git

BC Official support: Http://www.scootersoftware.com/support.php?zz=kb_vcs#gitwindows

GIT for WINDOWS

BC version 4 Diff at a Windows command prompt enter the commands:
  git config --global diff.tool bc3
  git config --global difftool.bc3.path "c:/Program Files (x86)/Beyond Compare 4/bcomp.exe"


Note:git versions older than 2.2.0 (Git--version) use "BC3" as the keyword for BC4. For Git 2.2.0+, use "BC". To launch a diff using Beyond Compare, use the command "Git difftool foofile.txt".

3-way Merge at a Windows command prompt, enter the commands:
  git config --global merge.tool bc3
  git config --global mergetool.bc3.path "c:/Program Files (x86)/Beyond Compare 4/bcomp.exe"


Note:git versions older than 2.2.0 (Git--version) use "BC3" as the keyword for BC4. For Git 2.2.0+, use "BC". To launch a 3-way merge using Beyond Compare, use the command "Git mergetool foofile.txt".

When the above settings are configured, use Gifftool to open beyond compare for comparison.

Git difftool <file>

Note that not git diff is only a comparison of---, ++++ text personality.

Also, if you want to use beyond compare to compare the differences of two branches, you can add parameters--dir-dif

git difftool--dir-dif Master dev &

The details refer to http://stackoverflow.com/questions/3365933/getting-beyond-compare-to-diff-2-branches-simultaneously

& refers to running in the background. Easy to do other operations

Use BEYONGD compare as the diff and merge tool for Git