t / t4018 / cpp-class-definitionon commit rerere: split conflict ID further (1869bbe)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};