t6036: tests for criss-cross merges with various directory/file conflicts
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 827f2b7d297dfbe20809c0be600827834c2c3992)
-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