t / t4018 / cpp-class-definitionon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1class RIGHT
   2{
   3        int ChangeMe;
   4};