On Mon, Apr 16, 2012 at 10:36 AM, Junio C Hamano <gitster@xxxxxxxxx> 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
--
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