merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
[gitweb.git] / t / t7004 /
drwxr-xr-x   parent (dest: t; base: f53d39778cf41cc93aa140bb41bb7d3a6590e179)
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg