ansaurus

Question

How to use git difftool to diff merge conflicts?

Answer 1

+2 A:

Try git mergetool.

3lectrologos 2010-09-18 14:08:04

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.

ticking 2010-09-19 08:03:27

Answer 2

+1 A:

Firstly try:

git difftool -t <yourtool>

If that doesn't work, look at man git-difftool and check the list of supported tools. Check if one of those does what you want, if it does then you've narrowed it down to git not supporting Kaleidoscope, which may need some other config tweaking.

Amoss 2010-09-18 14:28:53

I already configured it and `git difftool refA refB` works fine, what I want to do is use difftool when a merge failed do display the differences in the conflict files, git `diff defaults` works at this point but using difftool does the same as diff. It doesn't start kaleidoscope but it uses diff too.

ticking 2010-09-19 07:58:45

In that case I would agree with 3lectrologos. I normally do this with git mergetool.

Amoss 2010-09-19 11:33:17

ansaurus

tags:

views:

answers:

How to use git difftool to diff merge conflicts?

related questions