t / t4018 / cpp-class-definitionon commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};