merge script: --squash, --ff from unborn branch are errors
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 22e0560a70f4b5bfbbf571647e03fa154a6d6bd1)
-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