merge-recursive: handle D/F conflict case more carefully.
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: 4d50895a390658bf1b9a9385dbc0b9f90b48c803)
-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