From: Johannes Schindelin Date: Sat, 21 Oct 2006 00:06:44 GMT Subject: Re: [PATCH] Use diff3 instead of merge in merge-recursive. Message-ID: In-Reply-To: <20061020211121.GB3024@cepheus.pub> Hi, On Fri, 20 Oct 2006, Uwe Zeisberger wrote: > 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