merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / t / t5100 / msg0016
1 and some content
2