t / t4018 / cpp-class-definitionon commit merge-recursive: make "Auto-merging" comment show for other merges (05cf21e)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};