t / t4018 / cpp-class-definitionon commit merge-recursive: fix remaining directory rename + dirty overwrite cases (18797a3)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};