merge-recursive: avoid incorporating uncommitted changes in a merge
[gitweb.git] / contrib / contacts /
drwxr-xr-x   parent (dest: contrib; base: 65170c07d466)
-rw-r--r-- 1759 Makefile
-rwxr-xr-x 4509 git-contacts
-rw-r--r-- 2584 git-contacts.txt