Using windiff as diff tool in git

README.md

1/ copy windiff.exe to C:/WinDiff.exe

2/ create wrapper file C:/windiff/windiff.sh :

#!/bin/sh
"C:/WinDiff.exe" "$1" "$2"

3/ add windiff directory to path via cmd (in admin mode) :

setx path "%path%;C:\windiff"

5/ add to .gitconfig (in C:/user/xxx/.gitconfig):

[diff] 
tool = windiff 
[difftool "windiff"] 
cmd = windiff.sh \"$LOCAL\" \"$REMOTE\" 
[difftool] 
prompt = false

4/ use it with:

git difftool

OR

git difftool FILENAME