On Sun, Nov 16, 2008 at 15:19, Samuel Tardieu <sam@xxxxxxxxxxx> wrote: > You can use a custom merge driver especially designed for this case. > See gitattributes(5) man page for an explanation of how it works. Thanks. 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
