merge-recursive: remove ren[12]_other fields from rename_conflict_info
[gitweb.git] / contrib / credential / gnome-keyring /
drwxr-xr-x   parent (dest: contrib/credential; base: 3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08)
-rw-r--r-- 489 Makefile
-rw-r--r-- 11638 git-credential-gnome-keyring.c