From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 30 Aug 2008 17:55:24 GMT
Subject: Re: [PATCH] merge-recursive: fix subtree merge
Message-ID: <7vabeuie0j.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1220110929-6803-1-git-send-email-vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> On Mon, Aug 25, 2008 at 04:25:57PM +0200, Miklos Vajna <vmiklos@frugalware.org> 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.