t / t4018 / cpp-function-returning-pointeron commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1const char *get_it_RIGHT(char *ptr)
   2{
   3        ChangeMe;
   4}