Merge branch 'cp/merge-continue'
[git] / t / t5100 / patch0007