From: Steffen Prohaska <prohaska@zib.de>
Date: Tue, 15 Jul 2008 21:51:39 GMT
Subject: Re: git-mergetool + WinMerge
Message-ID: <D6807A06-2C86-45AB-8A62-FFFC62448293@zib.de>
In-Reply-To: <59f9aa2d-75f2-493d-8f83-1a5fcb24a889@34g2000hsh.googlegroups.com>


On Jul 15, 2008, at 4:55 AM, chongyc wrote:

> I am going to merge conflict by using git-mergetool of msysgit(for
> windows) and Winmerge.
>
> what shall i do?

If you have already read the documentation of "git mergetool", see

http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html

what is your specific question?

	Steffen