t / t4018 / cpp-function-returning-referenceon commit ll-merge: use a longer conflict marker for internal merge (d694a17)
   1string& get::it::RIGHT(char *ptr)
   2{
   3        ChangeMe;
   4}