merge-recursive: comment and reorder the merge_options fields

[git] / t / t4018 / cpp-class-definition

class RIGHT
{
        int ChangeMe;
};