t / t4018 / cpp-namespace-definitionon commit mergetool: honor diff.orderFile (57937f7)
   1namespace RIGHT
   2{
   3        ChangeMe;
   4}