merge-recursive: add computation of collisions due to dir rename & merging
[gitweb.git] / t / t4034 / html /
drwxr-xr-x   parent (dest: t/t4034; base: ea625cb0274c6907fba02f7af3ab83458b331a1e)
-rw-r--r-- 459 expect
-rw-r--r-- 116 post
-rw-r--r-- 79 pre