t / t5100 / msg0011on commit t6036: add lots of detail for directory/file conflicts in recursive case (327ac9c)
   1Here comes a commit log message, and
   2its second line is here.