merge-recursive: make "Auto-merging" comment show for other merges
[gitweb.git] / t / t5004 /
drwxr-xr-x   parent (dest: t; base: 05cf21eba29d18eb6cdece25613c6b1b036872d0)
-rw-r--r-- 7373 big-pack.zip
-rw-r--r-- 10240 empty-with-pax-header.tar
-rw-r--r-- 62 empty.zip