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