Hi, On Thu, 15 Jan 2009, Miklos Vajna wrote: > Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> > --- I think the idea can be simplified. Given lines A, B, C in the base commit, one branch _prepending_ the same triplet, and the other branch changing the B to a D. Only this time, nobody has a chance, even Darcs, because from the diff, you would not know if it was prepended or appended. (Which happens to be the same problem as 3-way merge has with the example you were implementing; only when looking at the detailed history becomes it clear what was done.) This all just proves again that there can be no perfect merge strategy; you'll always have to verify that the right thing was done. 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
