merge-recursive: avoid clobbering untracked files with directory renames
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: 79c47598f5c8c0008ae9281f20c2a041d4cabd93)
-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