t / t4018 / cpp-class-definitionon commit merge-recursive: rename merge_options argument from 'o' to 'opt' (259ccb6)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};