From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 Jul 2008 18:33:24 GMT
Subject: Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists
Message-ID: <7vmykc76dn.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1216555968-31406-1-git-send-email-vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> It co-existed with 'recursive' when rewriting it in C, but it no longer
> available.
>
> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
> ---
>
> On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi <nanako3@lavabit.com> wrote:
>> -     { "stupid",     0 },
>
> If we are at it, recur is also something unnecessary here.

Good eyes, both of you.  Will roll a die and commit one squashed,
creditting one of you at random ;-)