Git Mergetool: "No files need to be merged"

I am trying to set up git mergetool with vimdiff on Cygwin. I have installed the tool in git config using:

git config --global merge.tool vimdiff

      

However, when I do a merge that results in the error "Automatically merge, resolve conflicts, then commit the result." and run:

git mergetool

      

I get: "No files need to be merged", although the git status clearly shows that I have an unlinked path.

There are several posts on SO with similar problems, but I was unable to resolve this issue with any solutions for other questions. I also removed all lines in my .gitconfig except for git mergetool, and in a similar manner, I removed all lines in my vimrc. Is there any other config file or package I need (remember I'm using Cygwin) to make git mergetool open vimdiff? What am I missing? This is a trivial task for Linux.

+3


source to share


1 answer


You can try with the latest Git 2.12.1 for Windows first (no need for Cygwin: this distribution has its own bash) to see if the problem persists.

Second, make sure the conflitcs doesn't come from already committed files with merge markers in them.



Finally, make sure to use git mergetool

in the correct way
.

+2


source







All Articles