merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t4109 /
drwxr-xr-x   parent (dest: t; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rw-r--r-- 333 expect-1
-rw-r--r-- 246 expect-2
-rw-r--r-- 270 expect-3
-rw-r--r-- 363 patch1.patch
-rw-r--r-- 367 patch2.patch
-rw-r--r-- 393 patch3.patch
-rw-r--r-- 456 patch4.patch