Jeff King <peff@xxxxxxxx> writes: > What you queued in d5570f4 looks sane, but the merge into next is > curious. Thanks for spotting. I think I had rerere that recorded the conflict resolution with an older iteration of the topic with looser message default or something. -- 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