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

Re: [PATCH] Use diff3 instead of merge in merge-recursive.

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 21, 2006, 00:06 UTC
Message-ID
<Pine.LNX.4.63.0610210203390.14200@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<20061020211121.GB3024@cepheus.pub>
Hi,
On Fri, 20 Oct 2006, Uwe Zeisberger wrote:
Show 6 quoted lines
> Johannes Schindelin wrote:
>
> > I have to dig a little where I have it, but I think I can give it a try in 
> > a few hours (imagine this lyrics to the melody of the day job blues).
>
> Seems to be a long blues because you didn't sent any results. :-(

Yes. It was a long blues, and now instead of going to sleep I tested it. In the long run, it was negligible, with a high local variability (which stems from the fact that I had to run this test while the machine was under high load, which it will be for another 48 hours minimum).

It makes sense that performance-wise, it will not make a great difference. After all, the expensive operation is not the file-writing, but the merging pass.

Ciao, Dscho

Previous: Uwe Zeisberger
Message 8 of 8 in “Use diff3 instead of merge in merge-recursive.”
  1. Use diff3 instead of merge in merge-recursive.Uwe Zeisberger, Oct 18, 2006
  2. Jakub NarebskiOct 18, 2006
  3. Johannes SchindelinOct 18, 2006
  4. Linus TorvaldsOct 18, 2006
  5. Daniel BarkalowOct 19, 2006
  6. Johannes SchindelinOct 18, 2006
  7. Uwe ZeisbergerOct 20, 2006
  8. Johannes SchindelinOct 21, 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.