Search code examples
gitmergecygwinvimdiff

Git Mergetool: "No files need merging"

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

git config --global merge.tool vimdiff

However, when I perform a merge that results in "Automatic merge failed; fix conflicts and then commit the result." and run:

git mergetool

I get: "No files need merging" even though git status clearly shows that I have an unmerged path.

There are several posts on SO with similar problems, but I have not been able to solve this issue with any of the solutions for the other questions. I have also removed all the lines of my .gitconfig with the except of git mergetool, and similarly, I have removed all the lines of my vimrc. Is there some other config file or some package I need (recall I am using Cygwin) to make git mergetool to open vimdiff? What am I missing? This is a trivial task on Linux.

Solution

  • First, you can try with the latest Git 2.12.1 for Windows (no need for Cygwin: that distribution has its own bash), to see if the issue persists.

    Second, make sure the conflitcs does not comes from files already committed with merge markers in them.

    Finally, make sure to use git mergetool in the right path.