t / t5100 / msg0015on commit rerere: split conflict ID further (1869bbe)
   1  - a list
   2  - of stuff