merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 261f315bebfa9af2d09f20211960100ff06f87cb)
-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