Teach merge the '[-e|--edit]' option
[git.git] / t / t7004 / 
tree6a597d0ae6670a4b94fab2db839e237dfdd0b2d9
drwxr-xr-x   ..
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg