t / t4018 / cpp-class-definition-derivedon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1class RIGHT :
   2        public Baseclass
   3{
   4        int ChangeMe;
   5};