merge-recursive: comment and reorder the merge_options fields

[git] / t / t4018 / php-interface

interface RIGHT
{
    public function foo($ChangeMe);
}