On 23 Jul 2007, Jakub Narebski spake thusly: > Nix wrote: > >> And the problem is that while git has a lot of strategies for merging >> *trees*, its file merge system is totally unpluggable: it just falls >> back to xdiff's merging system. I guess I'll have to add that feature :) > > Not true. You can add custom diff driver for files using gitattributes > system. Oo. Excellent, I didn't notice that. Thank you. - 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
