On 2008-09-17 15:04:32 +0200, Karl Hasselström wrote: > Actually, the new infrastructure already uses apply (with fall-back > to merge-recursive). Specifically, since bc1ecd0b (Do simple in-index merge with diff+apply instead of read-tree) and afa3f9b9 (Reuse the same temp index in a transaction) -- Karl Hasselström, kha@xxxxxxxxxxx www.treskal.com/kalle -- 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