Merge branch 'jc/combine-diff-many-parents' into maint
[git] / t / t5100 / empty