Keep rename/rename conflicts of intermediate merges while doing recursive merge
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: a97e4075a16e0cbdf9c4aed736b5e762e035508b)
-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