threads / discuss / 14457

git-mergetool + WinMerge

Subject: git-mergetool + WinMerge

## tl;dr

2 messages between Jul 15, 2008 and Jul 15, 2008.

replies: 1people: 2as markdown or json

chongyc· Jul 15, 2008, 02:55 UTC · lore

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· Jul 15, 2008, 21:51 UTC · re: chongyc · lore

Re: git-mergetool + WinMerge

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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.