t / t4018 / cpp-operator-definitionon commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1Value operator+(Value LEFT, Value RIGHT)
   2{
   3        ChangeMe;
   4}