merge-recursive: comment and reorder the merge_options fields
[git] / t / t5100 / patch0007