t / t5100 / msg0001on commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1Here is a patch from A U Thor.
   2