merge-file --diff3: add a label for ancestor
[gitweb.git] / t / t9602 / cvsroot / module /
drwxr-xr-x   parent (dest: t/t9602/cvsroot; base: 4bb0936206b046a4fe606e9b0c9fe6ecc7a0ff69)
-rw-r--r-- 1415 default,v
drwxr-xr-x - sub1
drwxr-xr-x - sub2
drwxr-xr-x - sub3