From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Jul 2024 20:34:16 +0000 (-0700)
Subject: Merge branch 'ad/merge-with-diff-algorithm'
X-Git-Tag: v2.47.0-rc0~177
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f084c50de6b584f3c2fd2af3550c53f4f238d19b;p=thirdparty%2Fgit.git

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
---

f084c50de6b584f3c2fd2af3550c53f4f238d19b