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