merge-recursive: Improve handling of rename target vs. directory addition
[gitweb.git] / t / t4110 /
drwxr-xr-x   parent (dest: t; base: 51931bf08e7de1f597d36bc2fd38b5310b6da7dd)
-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