t / t5100 / msg0015on commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1  - a list
   2  - of stuff