Junio C Hamano <gitster@xxxxxxxxx> writes: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> What I meant was more along the lines of the following, but I think we >> would need a new kind of callback that can take N-way parents (which is >> not depicted here). >> >> Let me cook up something and get back to you later tonight. > > And here is a two-patch series to do just that. > > The first one is meant for you to use, and the second one is a sample > application of the new machinery. > > -- >8 -- > Subject: [PATCH 1/2] combine-diff: support format_callback > > This teaches combine-diff machinery to feed a combined merge to a callback > function when DIFF_FORMAT_CALLBACK is specified. After removing the change to combine-diff.c from your two-patch series, I applied them on top of this one, and queued the result in 'pu'. While I tried to be careful while doing this callback-for-combine-diff patch so that a callback function written for two-way diff can be used without any change as long as it does not care about the LHS (i.e. "one") of the filepair, please double check. I didn't read your change to submodule.c very carefully (and I didn't have to change it). The result seems to pass your new tests ;-). -- 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