t / t5100 / msg0011on commit merge-recursive: Have conflict_rename_delete reuse modify/delete code (e03acb8)
   1Here comes a commit log message, and
   2its second line is here.