threads / discuss / 56848

3-way diff tool support

Subject: 3-way diff tool support

## tl;dr

One message between Nov 5, 2021 and Nov 5, 2021.

replies: 0people: 1as markdown or json

Austin Stephens· Nov 5, 2021, 01:38 UTC · lore

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.

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