Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes: > On Tue, Sep 02, 2008 at 01:02:31PM -0700, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> I found it a bit disturbing that "index_only" and "call_depth" were >> not >> part of merge_options structure. > > Here are two patches to do it, on top of current mv/merge-recursive. I suspected that it always holds that "index_only === !!call_depth". Shouldn't strbuf obuf be part of the merge_options structure that describes the current call status? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
