How to use git difftool to diff merge conflicts?

Question

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

Solution

Try git mergetool.

Comments

[j-pb]

Mergetool will start an visual merging attempt e.g another app, I simply want a diff off the 2 conflicting files, the problem is that although git difftool refA refB normaly works, a git diff and git diftool will do the same in this case.