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

Re: Improved three-way blob merging code

From
Alex Riesen <raa.lkml@gmail.com>
Date
Jun 29, 2006, 07:43 UTC
Message-ID
<81b0412b0606290043s15e19b9fl853627e815f009ff@mail.gmail.com>
In-Reply-To
<Pine.LNX.4.64.0606282157210.12404@g5.osdl.org>
On 6/29/06, Linus Torvalds <torvalds@osdl.org> wrote:
> +static void *three_way_filemerge(mmfile_t *base, mmfile_t *our, mmfile_t *their, unsigned long *size)
> +{
...
> +       if (t1 && t2 && t3) {
> +               int code = run_command("merge", t2, t1, t3, NULL);

This does not use the labels of merge(1) and the merged file will contain the names of temporary files at conflict places, which is very confusing if you happen to loose context while doing a merge with lots of conflicts.

Previous: Linus TorvaldsNext: Linus Torvalds
Message 2 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.