merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / t / t5100 / msg0015
1   - a list
2   - of stuff