Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint
[git] / t / t5100 / patch0013