t / t4018 / cpp-class-definition-derivedon commit merge-recursive: switch from (oid,mode) pairs to a diff_filespec (8daec1d)
   1class RIGHT :
   2        public Baseclass
   3{
   4        int ChangeMe;
   5};