Re: recur status on linux-2.6
On Sun, Aug 13, 2006 at 03:54:19PM +0200, Johannes Schindelin wrote:
Show 6 quoted lines
> Hi,
>
> I tested git-merge-recur vs. git-merge-recursive on the linux-2.6
> repository last night. It contains 2298 two-head merges. _All_ of them
> come out identically with -recur as compared to -recursive (looking at
> the resulting index only).
After the latest updates to git-merge-recur it passes all the tests I
have too.
> That was the good news. The bad news is: it _seems_, that -recur is only
> about 6x faster than -recursive, not 10x, and this number becomes smaller,
> the longer the merge takes. So I see a startup effect here, probably.
That is a quite nice improvement anyway :)
- Fredrik