merge-recursive: comment and reorder the merge_options fields
[git] / t / t5100 / msg0001
1 Here is a patch from A U Thor.
2