merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: b26d87f2da22a5970b15bebe588bcd6ccac98e9b)
-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