diff --stat: do not count "unmerged" entries
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: 82dfc2c44ecda8a7afe417086c704b141a11cd58)
-rw-r--r-- 2844 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf