merge-recursive: Improve handling of rename target vs. directory addition
[gitweb.git] / t / t7004 /
drwxr-xr-x   parent (dest: t; base: 51931bf08e7de1f597d36bc2fd38b5310b6da7dd)
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg