Johan Herland <johan@xxxxxxxxxxx> writes: > Ok, I'm just worried that it'll force us to re-implement much of the three- > way merge logic that's already implemented in the merge machinery. There is no way around it, as long as you have that variable fan-out in the notes structure. Changing and unstabilizing "merge" for dubious benefit of code reuse is unacceptable, as the part that deals with variable fan-out has no benefit to the regular "merge". -- 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