Merge branch 'jk/two-way-merge-corner-case-fix'
[gitweb.git] / contrib / credential / osxkeychain /
drwxr-xr-x   parent (dest: contrib/credential; base: 3979580265bac968c30ce203022d7a8294710909)
-rw-r--r-- 420 Makefile
-rw-r--r-- 3865 git-credential-osxkeychain.c