checkout --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t9150 /
drwxr-xr-x   parent (dest: t; base: f0531a2937e919e763ab05e9800aef51658104fc)
-rw-r--r-- 1185 make-svk-dump
-rw-r--r-- 15522 svk-merge.dump