Merge branch 'ad/blame-diff-algorithm' into seen

"git blame" learns "--diff-algorithm=<algo>" option.

* ad/blame-diff-algorithm:
  blame: make diff algorithm configurable
  xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK

diff --cc diff.c
Simple merge

diff --cc merge-ort.c
Simple merge

diff --cc t/meson.build
Simple merge