Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[git] / t / t5100 / empty