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