Saturday, April 23, 2011

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

2. Add the following line to C:\Users\yccheok\.gitconfig

tool = diffmerge

[difftool "diffmerge"]
cmd = "C:/Progra~1/WinMerge/WinMergeU.exe" "$LOCAL" "$REMOTE" | cat

To test out, type the following command.

git difftool HEAD

It seems that using Git under Windows is still not a pleasant task yet.

No comments: