t / t4018 / cpp-class-definitionon commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};