Merge branch 'maint-2.6' into maint-2.7
[git] / t / t5100 / patch0007