Use "git merge" instead of "git pull ."
[gitweb.git] / t / t8005 /
drwxr-xr-x   parent (dest: t; base: a7bdee1122297442ac8eaaecf20db7363d48a14e)
-rw-r--r-- 66 euc-japan.txt
-rw-r--r-- 56 sjis.txt
-rw-r--r-- 71 utf8.txt