From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 17:36:55 GMT
Subject: Re: What's cooking in git.git (Apr 2012, #05; Thu, 12)
Message-ID: <7v7gxfwpc8.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CA+55aFwkf2bOLmUCU+_pSg0OzGyfQ1x-Cy_CiczpJN3zsThNWg@mail.gmail.com>

Linus Torvalds <torvalds@linux-foundation.org> writes:

> So  Ack on Michal's patch, but I think we also should do the appended
> equivalent thing for the fast-forward test on top of it (it's
> white-space damaged, sorry).
>
> Trivially tested with
>
>     git merge HEAD^ HEAD^^
>
> which did the wrong thing before, and now works.

And it seems to break 6028 ("merge -s ours" and "merge -s subtree"
up-to-date) X-<....