merge-recursive: move the global obuf to struct merge_options
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: c7d849243a4be2c60ff48cc42ea8b0518bb7f27f)
-rw-r--r-- 23 1-UTF-8.txt
-rw-r--r-- 100 2-UTF-8.txt
-rw-r--r-- 68 EUCJP.txt
-rw-r--r-- 86 ISO-2022-JP.txt
-rw-r--r-- 15 ISO-8859-1.txt