t / t5100 / msg0016on commit rerere: split conflict ID further (1869bbe)
   1and some content
   2