cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 1a2b985fb375e7ce14932bfc59365024af2fb6ab)
-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