Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[git] / t / t5100 / msg0007
1 Here is an empty patch from A U Thor.
2