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