Use "git merge" instead of "git pull ."
[gitweb.git] / t / t5004 /
drwxr-xr-x   parent (dest: t; base: a7bdee1122297442ac8eaaecf20db7363d48a14e)
-rw-r--r-- 10240 empty-with-pax-header.tar
-rw-r--r-- 62 empty.zip