t / t4018 / cpp-class-definition-derivedon commit t6036: add a failed conflict detection case: regular files, different modes (5d1daf3)
   1class RIGHT :
   2        public Baseclass
   3{
   4        int ChangeMe;
   5};