merge-recursive: comment and reorder the merge_options fields

[git] / t / t4018 / cpp-void-c-function

void RIGHT (void)
{
        ChangeMe;
}