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

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

diff --cc t/meson.build
index 8757b295954ebe5adf1899e818451175318015cb,d6c61b5ab55ea5d797de864c4f5acea57bfd38b8..bafb8e63a9363e4c576b3204ae37a0745b1aa140
--- 1/t/meson.build
--- 2/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',

diff --cc xdiff/xdiffi.c
Simple merge