merge-recursive: Fix sorting order and directory change assumptions
[gitweb.git] / t / t7004 /
drwxr-xr-x   parent (dest: t; base: f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144)
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg