From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Apr 2012 18:02:32 GMT
Subject: Re: What's cooking in git.git (Apr 2012, #05; Thu, 12)
Message-ID: <CA+55aFwPrjtAttsH75tTGHO=14g_2GbyOtUt4eY9LPHbtcXvcQ@mail.gmail.com>
In-Reply-To: <7v7gxfwpc8.fsf@alter.siamese.dyndns.org>

On Mon, Apr 16, 2012 at 10:36 AM, Junio C Hamano <gitster@pobox.com> wrote:
>
> And it seems to break 6028 ("merge -s ours" and "merge -s subtree"
> up-to-date) X-<....

Ugh. I don't even get that far - I get to t3410, which breaks.

(This is with both Michal's and my patch applied)

Oddly, running that test in verbose mode seems to imply that it's the
*rebase* that succeeds, not the merges in that test. Maybe I'm reading
the test results wrong, I didn't really try to understand the test
itself ;(

                        Linus