Git-2.5.2.2-64-bit cannot use vimdiff when merge conflic

Question

I use git bash in Win7. After I upgrade to Git-2.5 when I merge conflict, git said Cannot execute shell C:/Program Files/Git/usr/bin/bash.

I have added the vim and git into path.

How can fix it? Thanks!

Answer 1

try this command

MSYS_NO_PATHCONV=1 git mergetool

Git 2.5.3 Release Notes

Answer 2

I added this to my vimrc and it seems to be working for me now with GIT 2.5 (I guess the shell variable was messed up)

set shell=$COMSPEC