merge-recursive: Consider modifications in rename/rename(2to1) conflicts
[gitweb.git] / t / t4109 /
drwxr-xr-x   parent (dest: t; base: 434b8525e7a68893106f6360ff0a261f03c37512)
-rw-r--r-- 333 expect-1
-rw-r--r-- 246 expect-2
-rw-r--r-- 270 expect-3
-rw-r--r-- 363 patch1.patch
-rw-r--r-- 367 patch2.patch
-rw-r--r-- 393 patch3.patch
-rw-r--r-- 456 patch4.patch