Merge branch 'ah/diff-files-ours-theirs-doc'
[gitweb.git] / contrib / contacts /
drwxr-xr-x   parent (dest: contrib; base: 7203bafa88ff0a4f8702b0eee38bc36d7e542a81)
-rw-r--r-- 1759 Makefile
-rwxr-xr-x 4497 git-contacts
-rw-r--r-- 2584 git-contacts.txt