merge-recursive: comment and reorder the merge_options fields

[git] / t / t4018 / php-function

function RIGHT()
{
    return 'ChangeMe';
}