merge-recursive: Make room for directories in D/F conflicts
[gitweb.git] / t / t7006 /
drwxr-xr-x   parent (dest: t; base: ef02b317212443036be6007bba3a1a5946460dc9)
-rwxr-xr-x 1272 test-terminal.perl