t / t4018 / cpp-class-definitionon commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};