Merge branch 'da/mergetool-delete-delete-conflict'

[git] / t / t4018 / cpp-namespace-definition

namespace RIGHT
{
        ChangeMe;
}