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

3-way diff tool support

From
ASAustin Stephens <austinjstephens@gmail.com>
Date
Nov 5, 2021, 01:38 UTC
Message-ID
<CAO++afGMFu5XBQ7aSMJD4KraTQ+pbo5ksq3zULwFt01zj4HWHA@mail.gmail.com>

When might you be able to implement this? 3-way merges are doable, but I was hoping to be able to have my diff tool (Beyond Compare) be able to receive a 3-way diff from git without having to manually check out a copy or modify my repository's state. There are multiple Stack Overflow questions regarding this.

Message 1 of 1 in “3-way diff tool support”
  1. Austin StephensNov 5, 2021

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.