Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx> writes: > The current union merge driver is implemented as an post process. But the > xdl_merge code is quite capable to produce the result by itself. Therefore > move to it there and teach git-merge-file a new --union option. I like the idea of patch 2 and 3 but they are independent of what we do (or don't do) to merge-file. Could you flip the order of the patches so that 2 and 3 can go first? -- 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