Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
[git] / contrib / contacts /
drwxr-xr-x   ..
-rw-r--r-- 50 .gitignore
-rw-r--r-- 1759 Makefile
-rwxr-xr-x 4497 git-contacts
-rw-r--r-- 2584 git-contacts.txt