t / t5100 / msg0011on commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1Here comes a commit log message, and
   2its second line is here.