merge-recursive: avoid spurious rename/rename conflict from dir renames
[gitweb.git] / contrib / credential / osxkeychain /
drwxr-xr-x   parent (dest: contrib/credential; base: febb3a86098f853066c2623c2392f156710dd40f)
-rw-r--r-- 420 Makefile
-rw-r--r-- 3865 git-credential-osxkeychain.c