Merge branch 'bc/clone-bare-with-conflicting-config'
[git] / t / t5100 / patch0007