t / t4018 / cpp-template-function-definitionon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1template<class T> int RIGHT(T arg)
   2{
   3        ChangeMe;
   4}