merge-recursive: Fix deletion of untracked file in rename/delete conflicts
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: 531357a4cc2b93ec68099890b835f50e462ceab7)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt