t / t4018 / cpp-class-definitionon commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};