t / t5100 / msg0011on commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1Here comes a commit log message, and
   2its second line is here.