merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
[gitweb.git] / t / t4034 / objc /
drwxr-xr-x   parent (dest: t/t4034; base: c52ff85d97c698c902870305a010e2303e297b87)
-rw-r--r-- 2062 expect
-rw-r--r-- 266 post
-rw-r--r-- 248 pre