Why git difftool does not open vimdiff in case of conflicts?

Question

After reading this, I configured git to use vimdiff as diff/merge tool by adding following lines to my ~/.gitconfig:

[diff]
        tool = vimdiff
[merge]
        tool = vimdiff
[difftool]
        prompt = false
[alias]
        d = difftool

But git difftool still just prints diff (no vimdiff). Any ideas?

UPDATE. Seems like git difftool works fine, if I have some uncommitted changes in repo, i.e. it opens vimdiff as expected. But it fails to open vimdiff if I do git difftool after merge with conflict. Any ideas why?

Community · Accepted Answer · 2017-05-23 12:32:55Z

9

Ok, I found the answer here. git mergetool must be used instead of git difftool in case of conflicts.

edited May 23, 2017 at 12:32

CommunityBot

11 silver badge

answered Apr 4, 2016 at 8:49

Vram Vardanian

5991 gold badge5 silver badges16 bronze badges

Sign up to request clarification or add additional context in comments.

Comments

Igal S. · Accepted Answer · 2016-03-31 08:10:25Z

1

I don't know as for the why. But to fix it, reset the state of the conflicted file.

git status
    both modified: mymyfile.txt

git difftool myfile.txt #Fails
git reset myfile.txt

git status
    M myfile.txt

git difftool myfile.txt #should work

answered Mar 31, 2016 at 8:10

Igal S.

14.8k5 gold badges34 silver badges52 bronze badges

Collectives™ on Stack Overflow

Why git difftool does not open vimdiff in case of conflicts?

2 Answers 2

Comments

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

Comments

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related