merge-recursive: make "Auto-merging" comment show for other merges
[gitweb.git] / contrib / credential / gnome-keyring /
drwxr-xr-x   parent (dest: contrib/credential; base: 05cf21eba29d18eb6cdece25613c6b1b036872d0)
-rw-r--r-- 489 Makefile
-rw-r--r-- 11638 git-credential-gnome-keyring.c