Merge branch 'en/disable-dir-rename-in-recursive-merge'
[git] / t / t5100 / patch0007