t / t5100 / msg0011on commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Here comes a commit log message, and
   2its second line is here.