Thursday, April 26, 2012

Git mergetool kdiff3 setting for Mac 


[difftool "kdiff3"]
    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
    trustExitCode = false
[difftool]
    prompt = false
[diff]
    tool = kdiff3
[mergetool "kdiff3"]
    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
    trustExitCode = false
[mergetool]
    keepBackup = false
[merge]
    tool = kdiff3
Posted by at 5:44 PM
Labels:

1 comment:

  1. LordyJuly 26, 2013 at 9:20 AM

    I've used this page, so many times now!
    Kdiff3 is damned useful for merges

    ReplyDelete

Subscribe to: Post Comments (Atom)