merge-recursive: check for directory level conflicts
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: 53e32d4652a5cb073c8add8e7867fd7e76c2deff)
-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