merge-recursive: move the global obuf to struct merge_options
[gitweb.git] / t / t7004 /
drwxr-xr-x   parent (dest: t; base: c7d849243a4be2c60ff48cc42ea8b0518bb7f27f)
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg