merge-recursive: comment and reorder the merge_options fields
[git] / t / t5100 / msg0009
1 This is to fix diff-format documentation.
2