Shawn Pearce <spearce@xxxxxxxxxxx> writes: >> > What about all of those memcpy(a, b, 20)'s? :-) >> >> Surely. If you are inclined to, go wild. > > Like this? :-) Except some minor nits, yes. * I would have preferred two patches, one for "master" and one for the C merge-recursive topic (or at least "next"). * You missed a few in "master". * The cast in the second hunk in combine-diff.c was wrong; breakage was caught by our testsuite. I've pushed out a fixed up result in "master" and "next". - 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