Skip to content

Instantly share code, notes, and snippets.

@jglozano

jglozano/beyond-compare-setup.md

Last active February 9, 2018 16:01
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 jglozano/51b81536a10c76caf75a1fe74d8091fe to your computer and use it in GitHub Desktop.
Save jglozano/51b81536a10c76caf75a1fe74d8091fe to your computer and use it in GitHub Desktop.
Download ZIP
Beyond Compare Git Diff/Merge Setup
Raw
beyond-compare-setup.md

Diff

git config --global diff.tool bc3 git config --global difftool.bc3.path "c:/Program Files/Beyond Compare 4/bcomp.exe"

3way Merge

git config --global merge.tool bc3 git config --global mergetool.bc3.path "c:/Program Files/Beyond Compare 4/bcomp.exe"

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