Merge branch 'jc/maint-branch-mergeoptions' into maint
[git] / t / t5100 / patch0007