Merge branch 'sm/show-superproject-while-conflicted' into maint
[git] / t / t5100 / patch0007