t / t4018 / cpp-function-returning-nestedon commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1get::Item get::it::RIGHT()
   2{
   3        ChangeMe;
   4}
   5