Created
August 25, 2014 23:06
-
-
Save TehShrike/0169d70dcb186f089f59 to your computer and use it in GitHub Desktop.
Beyond Compare gitconfig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [diff] | |
| tool = bcomp | |
| [difftool] | |
| prompt = false | |
| [difftool "bcomp"] | |
| trustExitCode = true | |
| cmd = "/usr/local/bin/bcomp" "$LOCAL" "$REMOTE" | |
| [merge] | |
| tool = bcomp | |
| [mergetool] | |
| prompt = false | |
| [mergetool "bcomp"] | |
| trustExitCode = true | |
| cmd = "/usr/local/bin/bcomp" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment