cherry-pick/revert: add scissors line on merge conflict

[git] / t / t4018 / cpp-function-returning-reference

string& get::it::RIGHT(char *ptr)
{
        ChangeMe;
}