merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: febb3a86098f853066c2623c2392f156710dd40f)
-rw-r--r-- 224 appended1.c
-rw-r--r-- 1385 appended2.c
-rw-r--r-- 88 dummy.c
-rw-r--r-- 334 hello.c
-rw-r--r-- 407 includes.c