git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git-mergetool + WinMerge

From
chongyc <chongyc27@gmail.com>
Date
Jul 15, 2008, 02:55 UTC
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
Next: Steffen Prohaska
Message 1 of 2 in “git-mergetool + WinMerge”
  1. chongycJul 15, 2008
  2. Steffen ProhaskaJul 15, 2008

Read the whole thread, see it on lore, or plain text.

$ 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.