mergetool: honor tempfile configuration when resolving delete conflicts

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

namespace RIGHT
{
        ChangeMe;
}