From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Jan 2026 18:37:37 +0000 (-0800)
Subject: Merge branch 'yc/histogram-hunk-shift-fix' into seen
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0538fb71cfe22c62a5035fdae8974b0299feaa5;p=thirdparty%2Fgit.git

Merge branch 'yc/histogram-hunk-shift-fix' into seen

The final clean-up phase of the diff output could turn the result of
histogram diff algorithm suboptimal, which has been corrected.

* yc/histogram-hunk-shift-fix:
  xdiff: re-diff shifted change groups when using histogram algorithm
---

c0538fb71cfe22c62a5035fdae8974b0299feaa5
diff --cc t/meson.build
index 51f2a9b4d2,d6c61b5ab5..dc66c9dc87
--- a/t/meson.build
+++ b/t/meson.build
@@@ -504,7 -496,7 +504,8 @@@ integration_tests = 
    't4070-diff-pairs.sh',
    't4071-diff-minimal.sh',
    't4072-diff-max-depth.sh',
 +  't4073-diff-stat-name-width.sh',
+   't4074-diff-shifted-matched-group.sh',
    't4100-apply-stat.sh',
    't4101-apply-nonl.sh',
    't4102-apply-rename.sh',