Merge branch 'tr/maint-merge-ours-clarification' (early part)
[git] / t / t5100 / patch0013