t6036: tests for criss-cross merges with various directory/file conflicts
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: 827f2b7d297dfbe20809c0be600827834c2c3992)
-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