Hi, Daniel Barkalow wrote: > You might look at builtin-checkout and see if merge_working_tree() could > be made cleaner with this API, or if some other API could accomodate both > cases more nicely. Puhh, I've not dug into merging stuff that deep, but for me it does not look that this can be done in a useful way, i.e. merge_working_tree() does not do a recursive merge. Regards. -- Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F -- 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