Setup Git to Use WinMerge

It is rather cumbersome to setup WinMerge for Git.

Here are the summarize steps.

1. Add the following line to C:\Users\yccheok\.profile

export TERM=msys

SSH_ENV="$HOME/.ssh/environment"

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.