From: Chris Torek <chris.torek@gmail.com>
Date: Sun, 24 Apr 2022 01:57:37 GMT
Subject: Re: help request: unable to merge UTF-16-LE "text" file
Message-ID: <CAPx1GvdhWR2ZxcN1xsJSoX0BOqs0yp_+QXJ8+Y4asFY+2jrakw@mail.gmail.com>
In-Reply-To: <xmqq8rrzr6dp.fsf@gitster.g>

On Fri, Apr 22, 2022 at 10:27 AM Junio C Hamano <gitster@pobox.com> wrote:
> For that to work, it is likely that you'd need to convert not just
> the tips of two branches getting merged, but also the merge base
> commit, so that all three trees involved in the 3-way merge are in
> the same text encoding.

The old merge-recursive has `-X renormalize` that I believe would
do this for you. (I see code in merge-ort for this as well, but have no
handy means to test it myself.)

Chris