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.
#Config file [user] email = email@example.com name = test [core] editor = "C:\Program Files\Sublime Text 2\sublime_text.exe" [apply] whitespace = fix [color] branch = auto diff = auto interactive = auto status = auto [core] pager = less -FRSX whitespace = cr-at-eol autocrlf = input excludesfile = /Users/test/.gitignore_global editor = mate -w [alias] co = checkout lg = log --graph --pretty=oneline --abbrev-commit [gui] recentrepo = Y:/Projects/Junk recentrepo = C:/xampp/htdocs/onlinemedia [merge] tool = kdiff3
Screenshot of git config from GUI:
Leave a Reply