t / t4018 / cpp-struct-single-lineon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1void wrong()
   2{
   3}
   4
   5struct RIGHT_iterator_tag {};
   6
   7int ChangeMe;