Hi, On Sat, 31 Mar 2007, Alex Riesen wrote: > This patch leaves the base name in the resulting intermediate tree, to > propagate the conflict from intermediate merges up to the top-level merge. I'd rather have conflict files, i.e. for each entry in the index which is unmerged, write the file in this form: <<<<<< [stage2] ====== [stage3] >>>>>> mark as merged (i.e. remove stages 1--3 from the index, and add the conflicted file as stage 0) The big problem is that you _cannot_ leave unmerged entries in intermediate stages, because then, you could not write the tree. OTOH, you _need_ to mark them as unmerged _in the end_. That problem keeps me from just whipping up a patch in a few minutes, sending it untested to the list, and get all the blame for it. Ciao, Dscho - 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