On Fri, Apr 22, 2022 at 10:27 AM Junio C Hamano <gitster@xxxxxxxxx> 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
