Andrew's git / gitweb.git / t/t4018/cpp-namespace-definition
?
t / t4018 / cpp-namespace-definitionon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1namespace RIGHT
   2{
   3        ChangeMe;
   4}