Merge branch 'jk/error-resolve-conflict-advice'
[git] / t / t4018 / cpp-namespace-definition
1 namespace RIGHT
2 {
3         ChangeMe;
4 }