merge-recursive: add computation of collisions due to dir rename & merging
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: ea625cb0274c6907fba02f7af3ab83458b331a1e)
-rw-r--r-- 90 expect
-rw-r--r-- 163 patch1.patch
-rw-r--r-- 112 patch2.patch
-rw-r--r-- 131 patch3.patch
-rw-r--r-- 112 patch4.patch
-rw-r--r-- 117 patch5.patch