Categories
git

Setting Up Beyond Compare as Git mergetool and difftool

In git config #C:/User/Name/.gitconfig:

 

[user]
email = my@email.com
name = My Name
[core]
…
[diff]
tool = bc3
[difftool]
prompt = false
[difftool “bc3”]
path = C:/Program Files (x86)/Beyond Compare 3/Bcomp.exe
trustExitCode = true
[merge]
tool = bc3
[mergetool]
prompt = false
keepBackup = false
[mergetool “bc3”]
path = C:/Program Files (x86)/Beyond Compare 3/Bcomp.exe
trustExitCode = true
[alias]
dt = difftool
mt = mergetool

 

Then whenever you want to use beyond compare 3:

  • For Merge:

    • git mergetool

  • For Comparison:

    • git difftool hash/branch..hash/branch