Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> 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-<....
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html