t / t4018 / cpp-class-definitionon commit t6042: add testcase covering rename/add/delete conflict type (11d9ade)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};