[kuahyeow]

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

[juped]

histogram is a diff algorithm

[skywal_l]

From the article:

> switch the default 3 way merge algorithm to histogram