# git-mergetool + WinMerge

2 messages from 2008-07-15 to 2008-07-15. Participants: chongyc, Steffen Prohaska.
Thread: https://gitlist.dev/t/14457

## chongyc, 2008-07-15 02:55

Subject: git-mergetool + WinMerge
Message-ID: <59f9aa2d-75f2-493d-8f83-1a5fcb24a889@34g2000hsh.googlegroups.com>
URL: https://gitlist.dev/e/59f9aa2d-75f2-493d-8f83-1a5fcb24a889%4034g2000hsh.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

```

## Steffen Prohaska, 2008-07-15 21:51

Subject: Re: git-mergetool + WinMerge
Message-ID: <D6807A06-2C86-45AB-8A62-FFFC62448293@zib.de>
URL: https://gitlist.dev/e/D6807A06-2C86-45AB-8A62-FFFC62448293%40zib.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

```