t / t4018 / cpp-namespace-definitionon commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1namespace RIGHT
   2{
   3        ChangeMe;
   4}