t / t4018 / cpp-class-definitionon commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};