Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern...
[git] / contrib / emacs /
drwxr-xr-x   ..
-rw-r--r-- 6 .gitignore
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 17061 git-blame.el
-rw-r--r-- 69923 git.el