t / t4018 / cpp-class-definitionon commit t6044: new merge testcases for when index doesn't match HEAD (a6ee883)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};