merge-recursive: Fix deletion of untracked file in rename/delete conflicts
[gitweb.git] / t / t4034 / cpp /
drwxr-xr-x   parent (dest: t/t4034; base: 531357a4cc2b93ec68099890b835f50e462ceab7)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre