Merge branch 'jk/add-p-skip-conflicts' into maint
[git] / t / t5100 / msg0015--no-inbody-headers
1 From: bogosity
2   - a list
3   - of stuff