From: chongyc <chongyc27@gmail.com>
Date: Tue, 15 Jul 2008 02:55:46 GMT
Subject: git-mergetool + WinMerge
Message-ID: <59f9aa2d-75f2-493d-8f83-1a5fcb24a889@34g2000hsh.googlegroups.com>

Hi everybody

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

what shall i do?

Help me