merge-file --diff3: add a label for ancestor
[gitweb.git] / t / t1509 /
drwxr-xr-x   parent (dest: t; base: 4bb0936206b046a4fe606e9b0c9fe6ecc7a0ff69)
-rw-r--r-- 96 excludes
-rwxr-xr-x 1140 prepare-chroot.sh