Created
September 17, 2014 09:35
-
-
Save markcarrrr/17b331eb4874d997f3df to your computer and use it in GitHub Desktop.
.gitconfig - Beyond Compare
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 = bc3 | |
| [difftool] | |
| prompt = false | |
| [difftool "bc3"] | |
| cmd = \"C:/Program Files (x86)/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" | |
| [merge] | |
| tool = bc3 | |
| [mergetool] | |
| prompt = false | |
| [mergetool "bc3"] | |
| cmd = \"C:/Program Files (x86)/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" | |
| trustExitCode = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment