merge-recursive: comment and reorder the merge_options fields
[git] / t / t5100 / msg0018
1 a commit message
2