Merge branch 'cb/merge-recursive-fix'
[git] / t / t5100 / patch0008