merge-recursive: comment and reorder the merge_options fields
[git] / contrib / mw-to-git / bin-wrapper /
drwxr-xr-x   ..
-rwxr-xr-x 419 git