Fix "add -u" that sometimes fails to resolve unmerged paths
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 75973b2cb58bf2b3038c5c214fc0a1b96d6868fe)
-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