Created
August 15, 2012 00:28
-
-
Save NickJosevski/3354203 to your computer and use it in GitHub Desktop.
Beyond Compare .GitConfig
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
| ## .gitconfig | |
| [alias] | |
| dt = difftool | |
| mt = mergetool | |
| [diff] | |
| tool = bc3 | |
| [difftool] | |
| prompt = false | |
| [difftool "bc3"] | |
| cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" | |
| [merge] | |
| tool = bc3 | |
| [mergetool] | |
| prompt = false | |
| keepBackup = false | |
| [mergetool "bc3"] | |
| cmd = \"c:/program files (x86)/beyond compare 3/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
thanks for posting it. I am using beyond compare 4 and getting issues while merging dlls. Beyond compare won't let me pick which dll should be used as the source of truth. Is there something that i am doing wrong?