t / t5100 / msg0017on commit rerere: split conflict ID further (1869bbe)
   1New content here
   2