checkout --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t7006 /
drwxr-xr-x   parent (dest: t; base: f0531a2937e919e763ab05e9800aef51658104fc)
-rwxr-xr-x 1272 test-terminal.perl