t / t5100 / msg0011on commit t6042: add testcase covering rename/add/delete conflict type (11d9ade)
   1Here comes a commit log message, and
   2its second line is here.