Merge branch 'jn/setup-fixes'
[git] / t / t5100 / patch0007