merge: fix numerus bugs around "trivial merge" area
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 446247db78a733f44d2470afb1f1983d28058159)
-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