t / t5100 / patch0007on commit rerere: split conflict ID further (1869bbe)
   1