xdl_merge(): add optional ancestor label to diff3-style output
[gitweb.git] / t / t1509 /
drwxr-xr-x   parent (dest: t; base: 8a161433a0b414d15093e312eb9be99587074309)
-rw-r--r-- 96 excludes
-rwxr-xr-x 1140 prepare-chroot.sh