mergetool: honor tempfile configuration when resolving delete conflicts
[gitweb.git] / t / t5004 /
drwxr-xr-x   parent (dest: t; base: a2986045e3da24c850da03eaf2f2e2a56f8d4fff)
-rw-r--r-- 10240 empty-with-pax-header.tar
-rw-r--r-- 62 empty.zip