Make cherry-pick use rerere for conflict resolution.
[gitweb.git] / t / t7004 /
drwxr-xr-x   parent (dest: t; base: aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2)
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg