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
