t6036: add a failed conflict detection case with conflicting types
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: 451a3abc262575e5ed325b71547d345c55cc7d1d)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt