Merge branch 'tr/maint-merge-file-subdir'
[git] / t / t5100 / patch0007