merge-recursive: demonstrate an incorrect conflict with submodule
[gitweb.git] / git_remote_helpers /
drwxr-xr-x   parent (dest: ; base: 7d82b06d2be1b872a1debf79fadf0585afc70b69)
-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