merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / t / t5004 /
drwxr-xr-x   parent (dest: t; base: 261f315b)
-rw-r--r-- 10240 empty-with-pax-header.tar
-rw-r--r-- 62 empty.zip