Skip to content

Instantly share code, notes, and snippets.

@sebolio
Last active September 4, 2015 15:13
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save sebolio/f82f5da6115226ab179c to your computer and use it in GitHub Desktop.
Save sebolio/f82f5da6115226ab179c to your computer and use it in GitHub Desktop.
Usar kdiff3 como mergetool en Git
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