(off-list ancestor, not in this archive)
Re: [PATCH] merge-recursive: introduce merge_options · Junio C Hamano <hidden> · 2016-06-15
[PATCH] merge-recursive: introduce merge_options · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH] merge-recursive: introduce merge_options · Junio C Hamano <hidden> · 2016-06-15
[PATCH] merge-recursive: fix subtree merge · Miklos Vajna <hidden> · 2016-06-15
Re: [PATCH] merge-recursive: fix subtree merge · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH] merge-recursive: fix subtree merge · Miklos Vajna <hidden> · 2016-06-15

Re: [PATCH] merge-recursive: fix subtree merge

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:15

Miklos Vajna [off-list ref] writes:

On Mon, Aug 25, 2008 at 04:25:57PM +0200, Miklos Vajna [off-list ref] wrote:

quoted

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.