4 ms·

Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/blob/master/Documentation/RelNotes/2.34.0.txt https://github.com/git/git/blob/mas

Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/blob/master/Documentation/RelNotes/2.34.0.txt https://github.com/git/git/blob/master/Documentation/RelNote... ?

juped 3y ago
histogram is a diff algorithm
- skywal_l 3y ago
  From the article: > switch the default 3 way merge algorithm to histogram
  - toomim 3y ago
    Yeah, that was poorly written and confused me too. It should say "switch the default diff algorithm to histogram." The diff algorithm is used within the recursive 3-way merge algorithm.