push: avoid suggesting "merging" remote changes
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: fc6c4e96f13fe595fc8991d91c56f2abbe67dc89)
-rw-r--r-- 3689 apache.conf
-rwxr-xr-x 349 broken-smart-http.sh
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf