cherry-pick/revert: add scissors line on merge conflict
[git] / t / t4018 / cpp-namespace-definition
1 namespace RIGHT
2 {
3         ChangeMe;
4 }