Created
May 2, 2010 23:39
-
-
Save frogonwheels/387554 to your computer and use it in GitHub Desktop.
This file contains hidden or 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
| [mergetool "bc3"] | |
| cmd = \"c:/program files/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" | |
| trustExitCode = true | |
| [merge] | |
| tool = bc3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment