From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 08 Mar 2024 16:48:29 GMT
Subject: Re: [PATCH 3/4] merge options: add a conflict style member
Message-ID: <xmqqwmqcfz4y.fsf@gitster.g>
In-Reply-To: <48b2d5b1-a59f-44c3-94ba-e7f81913b7f5@gmail.com>

phillip.wood123@gmail.com writes:

> I agree it is confusing, Elijah renamed it from ll-merge.c relatively
> recently 6723899932e (merge-ll: rename from ll-merge, 2023-05-16). It
> looks like the idea was to group it with the other merge* files:

That reasoning cuts both ways.  When you are only interested in the
upper level API functions, being able to skip ll-anything as "low
level details" is a powerful thing.  merge-ll & hash-ll separated
far apart will make it impossible.