t / t4018 / cpp-function-returning-referenceon commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1string& get::it::RIGHT(char *ptr)
   2{
   3        ChangeMe;
   4}