t / t4018 / cpp-gnu-style-functionon commit t6036: add a failed conflict detection case with submodule modify/modify (d4d1718)
   1const char *
   2RIGHT(int arg)
   3{
   4        ChangeMe;
   5}