t6036: add a failed conflict detection case with conflicting types
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 451a3abc262575e5ed325b71547d345c55cc7d1d)
-rw-r--r-- 90 expect
-rw-r--r-- 163 patch1.patch
-rw-r--r-- 112 patch2.patch
-rw-r--r-- 131 patch3.patch
-rw-r--r-- 112 patch4.patch
-rw-r--r-- 117 patch5.patch