t / t5100 / msg0009on commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1This is to fix diff-format documentation.
   2