t / t4018 / cpp-gnu-style-functionon commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1const char *
   2RIGHT(int arg)
   3{
   4        ChangeMe;
   5}