git-pull.sh: Fix call to git-merge for new command format
[gitweb.git] / t / t7004 /
drwxr-xr-x   parent (dest: t; base: c0ecb07048ce2123589a2f077d296e8cf29a9570)
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg