Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes: > On Mon, Aug 25, 2008 at 04:25:57PM +0200, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: >> It also takes care of subtree merge, output buffering, verbosity, and >> rename limits - these were global variables till now in >> merge-recursive.c. > > Actually subtree_merge was not used from the struct merge_options, here > is the fix. This makes me wonder why we didn't see any breakages in the existing tests. -- 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
