checkout --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t7004 /
drwxr-xr-x   parent (dest: t; base: f0531a2937e919e763ab05e9800aef51658104fc)
-rw-r--r-- 1164 pubring.gpg
-rw-r--r-- 600 random_seed
-rw-r--r-- 1237 secring.gpg
-rw-r--r-- 1280 trustdb.gpg