Hi, On Sat, 31 Mar 2007, Johannes Schindelin wrote: > 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) Side note: for the "src->dest1,dest2" case, I really would like to see a threeway merge. But I would want the above-mentioned behaviour _before_ that, to make sure that we have a reasonable fallback for hard cases. 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