t1404: add a bunch of tests of D/F conflicts
[gitweb.git] / t / t4034 / objc /
drwxr-xr-x   parent (dest: t/t4034; base: 2e9de01aa0c44b539fca05b3ee552013d64c283a)
-rw-r--r-- 2062 expect
-rw-r--r-- 266 post
-rw-r--r-- 248 pre