Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/blob/master/Documentation/RelNote... ?
> switch the default 3 way merge algorithm to histogram
It should say "switch the default diff algorithm to histogram." The diff algorithm is used within the recursive 3-way merge algorithm.