merge-recursive: comment and reorder the merge_options fields

[git] / t / t4051 / dummy.c

static int dummy(void)  // Begin of dummy
{
        int rc = 0;

        return rc;
}       // End of dummy