On Tue, Aug 19, 2008 at 02:05:42AM -0700, Junio C Hamano <gitster@xxxxxxxxx> 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.
Attachment:
pgp7bdJ07EaWL.pgp
Description: PGP signature
