Hi, On Mon, 25 Jun 2007, Gerrit Pape wrote: > Hi, did you get to this yet?, not to stress you, just to make sure we > don't forget about it. Okay. Since now both you and Junio asked for it, and I made today a Git day for me, I looked into this. I'm not yet done, but preliminary results are: - cherry-pick calls merge-recursive, which in turn calls unpack_trees(), which in turn gives the ball to threeway_merge. But for d/f conflicts, it goes wrong. - Documentation/technical/trivial-merge.txt is maybe about a trivial merge. But the document is not trivial in and of itself. I'll keep going, 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
