merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / contrib / credential / gnome-keyring /
drwxr-xr-x   parent (dest: contrib/credential; base: 8daec1df03de)
-rw-r--r-- 489 Makefile
-rw-r--r-- 11638 git-credential-gnome-keyring.c