t / t4018 / cpp-namespace-definitionon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1namespace RIGHT
   2{
   3        ChangeMe;
   4}