merge-recursive: Make room for directories in D/F conflicts
[gitweb.git] / contrib / completion /
drwxr-xr-x   parent (dest: contrib; base: ef02b317212443036be6007bba3a1a5946460dc9)
-rwxr-xr-x 49347 git-completion.bash