merge-recursive: Fix sorting order and directory change assumptions
[gitweb.git] / t / lib-httpd /
drwxr-xr-x   parent (dest: t; base: f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144)
-rw-r--r-- 2400 apache.conf
-rw-r--r-- 24 passwd
-rw-r--r-- 227 ssl.cnf