t / t4018 / cpp-gnu-style-functionon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1const char *
   2RIGHT(int arg)
   3{
   4        ChangeMe;
   5}