Doing a three-way compare with Git and KDiff3

git kdiff3 diff3
Makis picture Makis · Sep 3, 2010 · Viewed 7.1k times · Source

Is it possible to set Git up so that I can use the three-way compare in KDiff3?

I have two branches that are far too different to auto-merge them, I simply have to check each merge point and I think the best way would be to check out the branch I want the changes from the other branch and say

git difftool HEAD_OF_OTHER_BRANCH -- .

And then select Merge File in KDiff3. After having gone through the files I'd just commit.

I have set up merge.conflictstyle and diff.conflictstyle to diff3 but KDiff3 still starts with a two-way diff. Is this possible? I guess if Git also sends the common ancestor's hash as a parameter, this is possible, but does it?

There is discussion about how to do this with SVN and BC3, but I couldn't find anything for Git and KDiff3.

Answer

Edson Medina picture Edson Medina · Mar 5, 2012

Run this on the command line:

git config --global mergetool.kdiff3.path /path/for/your/kdiff3/binary

Then, when solving conflicts you just have to do:

git mergetool --tool=kdiff3

Related questions

Git: How configure KDiff3 as merge tool and diff tool

Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I uninstalled GitExtension and install the latest version available of Git and KDiff3. When I make a merge and …

Read More
How to configure kdiff3 instead of emerge as a git mergetool?

I have Git on mac OSX Snow Leopard and I tried to edit my merge and diff tool to use kdiff3 instead of emerge. But when I try to use it does not launch the GUI of kdiff and keeps …

Read More
How to setup kdiff3 in Mac OS?

In.gitconfig file I setup up the git diff as follows: [diff] tool = kdiff3 [difftool "kdiff3"] path = path_directory/kdiff3.app In this setting kdiff is not accessible and I get the following error when I run in terminal >&…

Read More