t / t4018 / cpp-class-definitionon commit rebase: implement --merge via the interactive machinery (68aa495)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};