Merge branch 'jc/conflict-marker-size'
[git] / t / t5100 / empty