Merge branch 'en/merge-recursive-2'
[git] / t / t5100 / patch0007