Hi, I like this patch. merge-recursive is very talkative, to the intimidating astonishment of unsuspecting users. The real information is in the conflict markers now, which tell the user where what hunk came from. And the names in the markers are _really_ useful now. 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