Git diff broken in window git bash shell (Windows)

Question

I am working under Windows 7, using the github client and sometimes the git bash shell.

I used to configure my git diff tool with Winmerge using the following information: How do I view 'git diff' output with a visual diff program?

For an unknown reason, I cannot use the git diff command anymore:

$ git diff
error: cannot spawn winmerge.sh: No such file or directory
external diff died, stopping at path/to/a/file

winmerge.sh is located in a folder accessible from the path from the regular cmd shell, but not from the git bash shell.

I also tried to reset the git diff config by removing every line relative to diff and difftool (both in the ~/.gitconfig file and with the git config --global --unset command), but the error message above keep displaying when calling git diff.

Any help would be warmly appreciated!

`git diff` shouldn’t start the difftool but show a diff in the console. I’d suggest reinstalling it. — poke, Jan 21 '14 at 17:43
I uninstalled and reinstalled github client without success: *git diff* produces the same error... — Martin Delille, Jan 21 '14 at 17:55
Have you read [this documentation](http://git-scm.com/book/en/Customizing-Git-Git-Configuration#External-Merge-and-Diff-Tools)? — Elliott Frisch, Jan 21 '14 at 18:12
yes but my diff.tool is set to vs11: it shouldn't try to open winmerge.sh right? — Martin Delille, Jan 21 '14 at 18:46
Did you look at the local git config for the repo (`.git/config`)? Maybe something's wrong there. — Leonid Shevtsov, Jan 21 '14 at 19:13

score 0 · Accepted Answer · answered Aug 11 '14 at 09:01

0

In fact I had a reference to winmerge.sh in the PATH. Sorry for the bad question!

answered Aug 11 '14 at 09:01

Martin Delille

11,360
15
65
132

Git diff broken in window git bash shell (Windows)

1 Answers1