On Mon, Mar 26, 2012 at 20:17, Junio C Hamano <gitster@xxxxxxxxx> wrote: > It may be of interest to run "git help attributes" and read up on > "Defining a custom merge driver" section. Sounds good, thanks. My file layout looks fine? -- Richard -- 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