Merge branch 'fc/rerere-conflict-style' into maint
[gitweb.git] / contrib / contacts /
drwxr-xr-x   parent (dest: contrib; base: ada8710e634b4f9f686bd0477bd92b272ec60801)
-rwxr-xr-x 4497 git-contacts
-rw-r--r-- 2584 git-contacts.txt