merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / credential / osxkeychain /
drwxr-xr-x   parent (dest: contrib/credential; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 420 Makefile
-rw-r--r-- 3865 git-credential-osxkeychain.c