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