Created
October 31, 2018 00:05
-
-
Save infinity0/a270a4dd15a6df05c7f0c1e651e10234 to your computer and use it in GitHub Desktop.
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
| [merge] | |
| conflictstyle = diff3 | |
| tool = kdiff3 | |
| [mergetool] | |
| keepBackup = false | |
| keepTemporaries = false | |
| prompt = false | |
| ## then when you get a merge conflict, run "git mergetool" and it will run kdiff3 resolving as many conflicts automatiacyll as possible |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment