merge-recursive: separate message for common ancestors
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: e0453cd8f09aa03f3752d994011963ced7dea3ee)
-rw-r--r-- 2769 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf