t / t4018 / cpp-skip-labelson commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1void RIGHT (void)
   2{
   3repeat:         // C++ comment
   4next:           /* C comment */
   5        do_something();
   6
   7        ChangeMe;
   8}