merge-recursive: don't segfault while handling rename clashes
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: c94736a27f89bfc268aed0de7264deecdc136a58)
-rw-r--r-- 68 cp1251.txt
-rw-r--r-- 100 sjis.txt
-rw-r--r-- 100 utf8.txt