Skip to content

Instantly share code, notes, and snippets.

@jmvrbanac

jmvrbanac/BeyondCompare-gitconfig

Created April 9, 2013 20:18
Show Gist options
  • Save jmvrbanac/5349024 to your computer and use it in GitHub Desktop.
Save jmvrbanac/5349024 to your computer and use it in GitHub Desktop.
Download ZIP
Beyond Compare settings for git
Raw
BeyondCompare-gitconfig
[diff]
tool = bc3
[difftool]
prompt = false
[difftool "bc3"]
cmd=/opt/bcompare/bin/bcompare $LOCAL $REMOTE
[merge]
tool = bc3
[mergetool]
prompt = false
keepBackup = false
[mergetool "bc3"]
cmd=/opt/bcompare/bin/bcompare $LOCAL $REMOTE $BASE $MERGED
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment