t / t4018 / cpp-class-definitionon commit merge-recursive: add computation of collisions due to dir rename & merging (ea625cb)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};