t / t4018 / cpp-template-function-definitionon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1template<class T> int RIGHT(T arg)
   2{
   3        ChangeMe;
   4}