Documentation/git-merge: reword references to "remote" and "pull"
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 57bddb115331a23816af772172531fb56fceace4)
-rw-r--r-- 1358 apache.conf
-rw-r--r-- 227 ssl.cnf