t / t4018 / cpp-gnu-style-functionon commit merge-recursive: fix remaining directory rename + dirty overwrite cases (18797a3)
   1const char *
   2RIGHT(int arg)
   3{
   4        ChangeMe;
   5}