t / t4018 / cpp-function-returning-referenceon commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1string& get::it::RIGHT(char *ptr)
   2{
   3        ChangeMe;
   4}