On Tue, 17 Apr 2007, Junio C Hamano wrote: > > This allows 'merge' attribute to control how the file-level > three-way merge is done per path. Cool. Good job. The whole attribute thing seems to be really working out. Linus - 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