configuring kdiff3 as a mergetool in msysgit

September 3, 2010

0 minute read

How to configure kdiff3 as a mergetool in msysgit. (I think if you install kdiff3 before msysgit it is picked up automatically, if not, do the following after installing both).

In git bash:

git config --global merge.tool kdiff3git config --global mergetool.kdiff3.path "c:\Program Files\KDiff3\kdiff3.exe"

double check:

cat ~/.gitconfig[merge]  tool = kdiff3[mergetool "kdiff3"]  path = c:\\Program Files\\KDiff3\\kdiff3.exe

refs:

Under cygwin, the setup would be:

git config --global merge.tool kdiff3git config --global mergetool.kdiff3.path /cygdrive/c/Program\ Files\ \(x86\)/KDiff3/kdiff3.exe

Giving the config file contents:

[merge]        tool = kdiff3[mergetool "kdiff3"]        path = /cygdrive/c/Program Files (x86)/KDiff3/kdiff3.exe

Which by the way you can view with

git config -e --global

Share as Tweet || Share on LinkedIn
Post source code on GitHub - suggestions & PRs welcome!
Subscribe for updates on software development, contracting, side projects, blog posts and who knows what else. Read the archives for an idea of content.

Mailing list powered by the excellent buttondown.email.