merge-recursive: comment and reorder the merge_options fields
[git] / t / t4051 /
drwxr-xr-x   ..
-rw-r--r-- 224 appended1.c
-rw-r--r-- 1385 appended2.c
-rw-r--r-- 88 dummy.c
-rw-r--r-- 334 hello.c
-rw-r--r-- 407 includes.c