t6036: add a failed conflict detection case: regular files, different modes
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 5d1daf30cce5744b219002e0a6da015a13216cd1)
-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