From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Jun 2023 20:45:20 GMT
Subject: Re: [PATCH v4 00/12] config: remove global state from config iteration
Message-ID: <xmqqleg63qcf.fsf@gitster.g>
In-Reply-To: <pull.1497.v4.git.git.1687803083.gitgitgadget@gmail.com>

"Glen Choo via GitGitGadget" <gitgitgadget@gmail.com> writes:

> I also tested these patches on top of 'seen', and the only conflict I found was
> with en/header-split-cache-h-part-3, where ll-merge.c got renamed to merge-ll.c,
> so we need to apply the config refactor there (should work with .cocci).

Both recursive and ort merge strategies should be able to deal with
ll-merge.c <-> merge-ll.c, I think.

Thanks.