merge-recursive: do not clobber untracked working tree garbage
[gitweb.git] / t / t7004 /
drwxr-xr-x   parent (dest: t; base: c5ab03f26c992e30f355fba129f70db0f290fcd7)
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg