Merge branch 'jc/merge-symlink-ours-theirs'
[gitweb.git] / contrib / credential / gnome-keyring /
drwxr-xr-x   parent (dest: contrib/credential; base: 14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115)
-rw-r--r-- 489 Makefile
-rw-r--r-- 11638 git-credential-gnome-keyring.c