merge-recursive: comment and reorder the merge_options fields
[git] / t / diff-lib /
drwxr-xr-x   ..
-rw-r--r-- 18787 COPYING
-rw-r--r-- 2163 README