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