Created
June 5, 2015 21:51
-
-
Save jsplink/76fdbbcb560d13816049 to your computer and use it in GitHub Desktop.
.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
| [merge] | |
| tool = extMerge | |
| [mergetool "extMerge"] | |
| cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED" | |
| trustExitCode = false | |
| [diff] | |
| external = extDiff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment