merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / t / t5100 / msg0016--no-inbody-headers
1 Date: bogus
2
3 and some content
4