From: Miklos Vajna <vmiklos@frugalware.org>
Date: Tue, 19 Aug 2008 12:54:29 GMT
Subject: Re: What's cooking in git.git (Aug 2008, #05; Tue, 19)
Message-ID: <20080819125429.GD17582@genesis.frugalware.org>
In-Reply-To: <7vpro5cr2x.fsf@gitster.siamese.dyndns.org>

On Tue, Aug 19, 2008 at 02:05:42AM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> [On Hold]
> (...)
> * mv/merge-recursive (Tue Aug 12 22:14:00 2008 +0200) 3 commits
>  - Make builtin-revert.c use merge_recursive_generic()
>  - merge-recursive.c: Add more generic merge_recursive_generic()
>  - Split out merge_recursive() to merge-recursive.c
> 
> I do not think builtlin-revert should use "recursive", but these patches
> give a good starting point to separate the bulk of the "rename-aware
> three-way merge" into library form.

I wanted to send a patch that makes builtin-merge use the new
merge_recursive_setup(), but then I was not able to decide to use
merge_recursive_generic() or not.

What is your preference here? I just want to avoid a "this could be
merged, but it uses merge_recursive(), not merge_recursive_generic()" or
the opposite of this. :)

Thanks.