merge-recursive: comment and reorder the merge_options fields
[git] / t / t9161 /
drwxr-xr-x   ..
-rw-r--r-- 4898 branches.dump