Andrew's git / gitweb.git / t/t4018/cpp-function-returning-reference
?
t / t4018 / cpp-function-returning-referenceon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1string& get::it::RIGHT(char *ptr)
   2{
   3        ChangeMe;
   4}