我的路径上有VS2015 SP1和WinMerge,在我的解决方案.git/config和.gitconfig(在C:\ users\username下)中没有设置,它正在工作:
[diff] tool = winmerge [difftool "winmerge"] cmd = winmergeu.exe -e -ub -x -wl -u -maximise -dl "base" -dr "mine" \"$LOCAL\" \"$REMOTE\"