t6036: Test index and worktree state, not just that merge fails
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: c976260d0f3d3f99dc3594e3f98436bfd920dc97)
-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