Skip to content

Instantly share code, notes, and snippets.

@AndrewSoltes

AndrewSoltes/gist:4106317

Created November 18, 2012 17:16
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save AndrewSoltes/4106317 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save AndrewSoltes/4106317 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