Skip to content

Instantly share code, notes, and snippets.

@peterneave

peterneave/gitkdiff.setttings

Created November 17, 2022 06:05
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 peterneave/65ddc98b531a44d9642413db4234e912 to your computer and use it in GitHub Desktop.
Save peterneave/65ddc98b531a44d9642413db4234e912 to your computer and use it in GitHub Desktop.
Download ZIP
Git settings for KDIFF3 on Windows
Raw
gitkdiff.setttings
[merge]
tool = kdiff3
[mergetool "kdiff3"]
path = C:/Program Files/KDiff3/kdiff3.exe
trustExitCode = false
[diff]
guitool = kdiff3
[difftool "kdiff3"]
path = C:/Program Files/KDiff3/kdiff3.exe
trustExitCode = false
[mergetool]
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment