Here are the summarize steps.
- Add the following line to C:\Users\yccheok\.profile
2. Add the following line to C:\Users\yccheok\.gitconfig
[diff]tool = diffmerge[difftool "diffmerge"]cmd = "C:/Progra~1/WinMerge/WinMergeU.exe" "$LOCAL" "$REMOTE" | cat
To test out, type the following command.
git difftool HEAD A.java
It seems that using Git under Windows is still not a pleasant task yet.