merge-recursive: consolidate unnecessary fields in merge_options
[git] / negotiator /
drwxr-xr-x   ..
-rw-r--r-- 4258 default.c
-rw-r--r-- 160 default.h
-rw-r--r-- 6011 skipping.c
-rw-r--r-- 163 skipping.h