From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Fri, 05 Jul 2024 20:14:04 GMT
Subject: Re: [PATCH] merge-file: warn for implicit 'myers' algorithm
Message-ID: <1fd4be07-47ba-4db4-b8aa-860c23b5dd39@delpeuch.eu>
In-Reply-To: <CABPp-BEspjHqNXSAwptgxP059qOFU6MzwAd23-893Nw99ft_Ew@mail.gmail.com>

Thanks both.

It sounds like there is a strong case for at least making "merge-file"
honour the `diff.algorithm` config variable, possibly with more
fine-grained config variables as suggested by Junio. I'll try to make a
patch for that.

Elijah, if any of your work on improving the histogram diff can be
shared (for instance by writing down a description of the issues you'd
like to address), I would be interested to have a look and perhaps help
out if doable. But as far as I can tell there seems to be a lot of fans
of the existing algorithm already, and such heuristics can never be
perfect, so hopefully we can make the switch in a not too distant future.

Best,

Antonin