merge-recursive: Fix modify/delete resolution in the recursive case
[gitweb.git] / t / t4034 / objc /
drwxr-xr-x   parent (dest: t/t4034; base: ec61d14963470b02db0d6e3825e2b5bbb1815cb6)
-rw-r--r-- 2062 expect
-rw-r--r-- 266 post
-rw-r--r-- 248 pre