merge-recursive: comment and reorder the merge_options fields
[git] / t / t4256 /
drwxr-xr-x   ..
drwxr-xr-x - 1