[msysGit] git-mergetool + WinMerge

[chongyc]

Hi everybody

I am going to merge conflict by using git-mergetool of msysgit(for
windows) and Winmerge.

what shall i do?

Help me