Skip to content

Instantly share code, notes, and snippets.

@stormoz

stormoz/configure kdiff tree

Created January 18, 2016 02:15
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 stormoz/b66e2c3681ed467af954 to your computer and use it in GitHub Desktop.
Save stormoz/b66e2c3681ed467af954 to your computer and use it in GitHub Desktop.
Download ZIP
configure kdiff tree
Raw
configure kdiff tree
#from http://stackoverflow.com/questions/6412516/configuring-diff-tool-with-gitconfig
[difftool "kdiff3"]
path = C:/Progra~1/KDiff3/kdiff3.exe
trustExitCode = false
[difftool]
prompt = false
[diff]
tool = kdiff3
[mergetool "kdiff3"]
path = C:/Progra~1/KDiff3/kdiff3.exe
trustExitCode = false
[mergetool]
keepBackup = false
[merge]
tool = kdiff3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment