Skip to content

Instantly share code, notes, and snippets.

@alincc

alincc/gist:e5f3bae176b37c963cd440f7c718fe3e

Forked from AndrewSoltes/gist:4106317
Created January 19, 2017 16:38
Show Gist options
  • Save alincc/e5f3bae176b37c963cd440f7c718fe3e to your computer and use it in GitHub Desktop.
Save alincc/e5f3bae176b37c963cd440f7c718fe3e to your computer and use it in GitHub Desktop.
Download ZIP
set up kdiff3 with git
Raw
gistfile1.txt
git config --global merge.tool kdiff3
git config --global mergetool.keepBackup false
#on windows
git config --global mergetool.kdiff3.path 'G:\win\KDiff3\kdiff3.exe'
#remove backups option in kdiff3 settings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment