merge-recursive: comment and reorder the merge_options fields
[git] / RelNotes
1 Documentation/RelNotes/2.23.0.txt