Clemens Buchacher <drizzd@xxxxxx> writes: > If it's a regression, it dates far back, since 1.5.0 fails as well. A good lit(h)mus test to see if it is a regression or just a plain bug in the recursive strategy would be to see what 'resolve' strategy does (replace "merge" with "merge -s resolve" in your test). -- 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
