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

Re: Improved three-way blob merging code

From
DLDavide Libenzi <davidel@xmailserver.org>
Date
Jun 29, 2006, 18:21 UTC
Message-ID
<Pine.LNX.4.64.0606291118110.8615@alien.or.mcafeemobile.com>
In-Reply-To
<Pine.LNX.4.64.0606282157210.12404@g5.osdl.org>
On Wed, 28 Jun 2006, Linus Torvalds wrote:
> It would be lovely if libxdiff did a 3-way merge on its own, but this
> basically approximates it within that three_way_filemerge() function
> using external functionality.

This is my todo-list, that unfortunately is pretty crowded nowadays. I'll come graveling you main window once I have it ;)

- Davide
Previous: Alex Riesen
Message 5 of 5 in “Improved three-way blob merging code”
  1. Linus TorvaldsJun 29, 2006
  2. Alex RiesenJun 29, 2006
  3. Linus TorvaldsJun 29, 2006
  4. Alex RiesenJun 29, 2006
  5. Davide LibenziJun 29, 2006

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.