| commit | f084c50de6b584f3c2fd2af3550c53f4f238d19b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 31 Jul 2024 20:34:16 +0000 (31 13:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 31 Jul 2024 20:34:16 +0000 (31 13:34 -0700) | ||
| tree | 88a1f0aa9ea2922f42f249ae64e2c530aead39b1 | treesnapshot (tar.gz zip) |
| parent | 6a52f307af0e53aac2fcab8f995f69789472c334 | commitdiff |
| parent | 9c93ba4d0aee1bc8c663a13552afd2b2c22863a9 | commitdiff |
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
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