merge-recursive: Make room for directories in D/F conflicts
[gitweb.git] / git_remote_helpers /
drwxr-xr-x   parent (dest: ; base: ef02b317212443036be6007bba3a1a5946460dc9)
-rw-r--r-- 873 Makefile
-rw-r--r-- 512 __init__.py
drwxr-xr-x - git
-rw-r--r-- 515 setup.py
-rw-r--r-- 6333 util.py