mergetool

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

09 Nov 2018, 08:43 PM
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...