Git with KDiff3 – Windows

Hey all,

Just a quick post showing the config I needed to use in order to get KDiff3 working with git. It took a while to get this working so hopefully it’ll be able to help someone else out.

  1. #Config file
  2. [user]
  3. 	email = test@test.com.au
  4. 	name = test
  5. [core]
  6. 	editor = \"C:\\Program Files\\Sublime Text 2\\sublime_text.exe\"
  7.  
  8. [apply]
  9.     whitespace = fix
  10.  
  11. [color]
  12.     branch = auto
  13.     diff = auto
  14.     interactive = auto
  15.     status = auto
  16.  
  17.  
  18. [core]
  19.         pager = less -FRSX
  20.         whitespace = cr-at-eol
  21.         autocrlf = input
  22.         excludesfile = /Users/test/.gitignore_global
  23.         editor = mate -w
  24.  
  25. [alias]
  26.         co = checkout
  27.         lg = log --graph --pretty=oneline --abbrev-commit
  28.  
  29. [gui]
  30. 	recentrepo = Y:/Projects/Junk
  31. 	recentrepo = C:/xampp/htdocs/onlinemedia
  32. [merge]
  33. 	tool = kdiff3

Screenshot of git config from GUI:

Git Config KDiff

Git Config KDiff

Running KDiff3:

Executing KDiff3

Executing KDiff3

KDiff3 display:

KDiff3 Display

KDiff3 Display

Leave a Reply

This site uses Akismet to reduce spam. Learn how your comment data is processed.