merge-recursive: comment and reorder the merge_options fields
[git] / ci / util /
drwxr-xr-x   ..
-rwxr-xr-x 949 extract-trash-dirs.sh