merge: enable defaulttoupstream by default
[git] / t / t5100 / patch0007