merge-recursive: add computation of collisions due to dir rename & merging
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: ea625cb0274c6907fba02f7af3ab83458b331a1e)
-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