From: Stephan Beyer Date: Wed, 13 Aug 2008 17:29:38 GMT Subject: Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic() Message-ID: <20080813172938.GC12871@leksak.fem-net> In-Reply-To: Hi, Daniel Barkalow wrote: > You might look at builtin-checkout and see if merge_working_tree() could > be made cleaner with this API, or if some other API could accomodate both > cases more nicely. Puhh, I've not dug into merging stuff that deep, but for me it does not look that this can be done in a useful way, i.e. merge_working_tree() does not do a recursive merge. Regards. -- Stephan Beyer , PGP 0x6EDDD207FCC5040F