Merge branch 'ad/merge-with-diff-algorithm'

Many Porcelain commands that internally use the merge machinery were taught to consistently honor the diff.algorithm configuration. * ad/merge-with-diff-algorithm: merge-recursive: honor diff.algorithm