merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: c52ff85d97c698c902870305a010e2303e297b87)
-rw-r--r-- 23 1-UTF-8.txt
-rw-r--r-- 100 2-UTF-8.txt
-rw-r--r-- 86 ISO-2022-JP.txt
-rw-r--r-- 15 ISO8859-1.txt
-rw-r--r-- 68 eucJP.txt