merge-recursive: fix remaining directory rename + dirty overwrite cases
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: 18797a3b10e4077473740b953651b0032828d0fb)
-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