merge-recursive: comment and reorder the merge_options fields
[git] / block-sha1 /
drwxr-xr-x   ..
-rw-r--r-- 7534 sha1.c
-rw-r--r-- 712 sha1.h