Merge branch 'jk/add-i-diff-compact-heuristics' into maint
[git] / t / t5100 / patch0007