merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / contrib / credential / osxkeychain /
drwxr-xr-x   parent (dest: contrib/credential; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rw-r--r-- 420 Makefile
-rw-r--r-- 3865 git-credential-osxkeychain.c