How to use git difftool to diff merge conflicts?

git merge diff config conflict
j-pb picture j-pb · Sep 18, 2010 · Viewed 28.9k times · Source

After a merge failed with some conflicts I can list those with git diff, but git difftool won't display them with the difftool set in the config(in my case Kaleidoscope), instead it will just use normal diff.

A git difftool comparing with a previous commit will work.

Is there a way to use git difftool on merge conflicts?

Greets Jan

Answer

3lectrologos picture 3lectrologos · Sep 18, 2010

Try git mergetool.

Related questions

Git diff between current branch and master but not including unmerged master commits

I want a diff of all changes in a branch that is not merged to master yet. I tried: git diff master git diff branch..master git diff branch...master However, in each of these cases the diff contains content …

Read More
How do I create a readable diff of two spreadsheets using git diff?

We have a lot of spreadsheets (xls) in our source code repository. These are usually edited with gnumeric or openoffice.org, and are mostly used to populate databases for unit testing with dbUnit. There are no easy ways of doing …

Read More
Using Visual Studio 2012's built-in merge tool with Git

So, I don't know if anyone's noticed but the new Merge Tool packaged with VS2012 is sick-o to the max. I've recently moved to Git for my source control and really want to be able to set up VS2012 as …

Read More