Junio C Hamano wrote: > Since the very beginning when we added the "renormalizing" parameter > to this function with 7610fa57 (merge-recursive --renormalize, > 2010-08-05), nobody seems to have ever referenced it. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx> > * ... or is there any "renormalization" the said commit meant to > but forgot to do? I suspect it's related to this TODO from rerere.c::handle_cache: /* * NEEDSWORK: handle conflicts from merges with * merge.renormalize set, too */ ll_merge(&result, path, &mmfile[0], NULL, &mmfile[1], "ours", &mmfile[2], "theirs", NULL); But if someone has time for it, rather than plumbing in a useless parameter that goes nowhere, it would be better to add tests as a reminder of what is unimplemented. :) Thanks, Jonathan -- 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