t / t4018 / cpp-gnu-style-functionon commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1const char *
   2RIGHT(int arg)
   3{
   4        ChangeMe;
   5}