From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Mar 2026 19:31:34 +0000 (-0700)
Subject: Merge branch 'yc/histogram-hunk-shift-fix'
X-Git-Tag: v2.54.0-rc0~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=231f8100c41fdbdd49f5bca953fff775a79321db;p=thirdparty%2Fgit.git

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

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

231f8100c41fdbdd49f5bca953fff775a79321db
diff --cc t/meson.build
index 8757b29595,d6c61b5ab5..bafb8e63a9
--- a/t/meson.build
+++ b/t/meson.build
@@@ -508,7 -496,7 +508,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',