On 4/11/07, Junio C Hamano <junkio@xxxxxxx> wrote:
Also there is that small D/F conflict problem merge-recursive has that I told you about, which does not exist in git-apply ;-) Did you have a chance to take a look at it yet?
not yet. I was greatly distracted by subprojects - 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