Last active
September 4, 2015 15:13
-
-
Save sebolio/f82f5da6115226ab179c to your computer and use it in GitHub Desktop.
Usar kdiff3 como mergetool en Git
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
git config --global mergetool.kdiff3.path "/Applications/kdiff3.app/Contents/MacOS/kdiff3" | |
git config --global merge.tool kdiff3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment