merge: teach -Xours/-Xtheirs to symbolic link merge
[gitweb.git] / contrib / credential / osxkeychain /
drwxr-xr-x   parent (dest: contrib/credential; base: fd48b464747c275b3d014b3f14d60d9ac19d184a)
-rw-r--r-- 420 Makefile
-rw-r--r-- 3865 git-credential-osxkeychain.c