Created
February 13, 2015 00:32
-
-
Save itsananderson/127e017d07caefa5d1b0 to your computer and use it in GitHub Desktop.
git diff/merge config for kdiff3
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
| [diff] | |
| tool = kdiff3 | |
| [difftool "kdiff3"] | |
| cmd = 'c:\\Program Files\\kdiff3\\kdiff3' $LOCAL $REMOTE | |
| keepBackup = false | |
| trustExitCode = true | |
| keepTemporaries = false | |
| [merge] | |
| tool = kdiff3 | |
| [mergetool "kdiff3"] | |
| path = c:\\Program Files\\kdiff3\\kdiff3 | |
| keepBackup = false | |
| trustExitCode = true | |
| keepTemporaries = false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment