Create a gist now

Instantly share code, notes, and snippets.

What would you like to do?
Beyond Compare .GitConfig
## .gitconfig
dt = difftool
mt = mergetool
tool = bc3
prompt = false
[difftool "bc3"]
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
tool = bc3
prompt = false
keepBackup = false
[mergetool "bc3"]
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true

madansr commented Jul 25, 2014

thanks for posting it. I am using beyond compare 4 and getting issues while merging dlls. Beyond compare won't let me pick which dll should be used as the source of truth. Is there something that i am doing wrong?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment