Skip to content

Instantly share code, notes, and snippets.

@stevenharman
Created December 11, 2009 20:58
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save stevenharman/254504 to your computer and use it in GitHub Desktop.
Save stevenharman/254504 to your computer and use it in GitHub Desktop.
git config --global diff.tool bc3
git config --global difftool.bc3.cmd "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"\$LOCAL\" \"\$REMOTE\""
git config --global difftool.prompt false
git config --global merge.tool bc3
git config --global mergetool.bc3.cmd "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\""
git config --global mergetool.bc3.trustExitCode true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment