Junio C Hamano <gitster@xxxxxxxxx> writes: > Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > >> ... I would say: the >> recursive merge-base was computed internally, but not really meant to be >> shown to the user. > > I wonder if the output becomes easier to read if we unconditionally > turned off diff3-style for inner merges. Or replace the whole conflict markers with "Sorry, cannot compute a merge base" text when doing the recursive merge to build the merge base. I don't know that area well enough to have a real opinion. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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