t / t4051 / dummy.con commit merge-recursive: check for directory level conflicts (53e32d4)
   1
   2static int dummy(void)  // Begin of dummy
   3{
   4        int rc = 0;
   5
   6        return rc;
   7}       // End of dummy