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