From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Thu, 30 Jan 2025 02:29:41 GMT
Subject: Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)
Message-ID: <Z5rkFcp_awa2hjxu@tapette.crustytoothpaste.net>
In-Reply-To: <xmqq4j1iokvv.fsf@gitster.g>

On 2025-01-28 at 18:26:12, Junio C Hamano wrote:
> Here is what I'd directly apply to 'next'.  The merge-fix mechanism
> knows about the same change, so when I merge the bc/doc-adoc-not-txt
> topic down to 'master', the same tweak will be made as an evil
> merge.

I agree that seems like the right solution.
-- 
brian m. carlson (they/them or he/him)
Toronto, Ontario, CA