From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 02 Oct 2025 21:02:54 GMT
Subject: Re: [PATCH 0/3] Makefile update libgit.a: Include xdiff and reftable in libgit.a
Message-ID: <xmqqtt0huidd.fsf@gitster.g>
In-Reply-To: <xmqqecrmyz9j.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

> This topic, however, especially its first step, had caused rather
> unpleasant textual conflicts when merged to 'seen' (I didn't check
> which other topic was the most heavily conflicting, though).  I may
> attempt to get a clean merge again tomorrow, but due to time
> pressure, tonight's 'seen' was done without these patches merged.

I think I have sorted it out.  I'll push out 'seen' with this topic
at the tip, so could you please check the resulting Makefile for any
funny mismerges?

Thanks.