Guide to configure KDiff3 as git merge tool and diff tool (Mac)

This is a simple guide to configure your git merge tool and diff tool to use KDiff3.

Install KDiff3

 https://sourceforge.net/projects/kdiff3/files/

Configure Git

Execute in terminal

git config --add merge.tool kdiff3
git config --add mergetool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3 
git config --add mergetool.kdiff3.trustExitCode false
git config --add diff.guitool kdiff3
git config --add difftool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3 
git config --add difftool.kdiff3.trustExitCode false

 

Add new comment

This question is for testing whether or not you are a human visitor and to prevent automated spam submissions.