merge-recursive: comment and reorder the merge_options fields

[git] / t / t4018 / cpp-function-returning-pointer

const char *get_it_RIGHT(char *ptr)
{
        ChangeMe;
}