git-merge-octopus: do not capitalize "octopus"
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 1c67d534d9d807639a505835eb3505b103426b47)
-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