t / t4018 / cpp-class-definition-derivedon commit t7405: add a file/submodule conflict (594a867)
   1class RIGHT :
   2        public Baseclass
   3{
   4        int ChangeMe;
   5};