merge-recursive: remove ren[12]_other fields from rename_conflict_info
[gitweb.git] / contrib / contacts /
drwxr-xr-x   parent (dest: contrib; base: 3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08)
-rw-r--r-- 1759 Makefile
-rwxr-xr-x 4509 git-contacts
-rw-r--r-- 2584 git-contacts.txt