t / t4018 / cpp-function-returning-pointeron commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1const char *get_it_RIGHT(char *ptr)
   2{
   3        ChangeMe;
   4}