Merge branch 'jc/ll-merge-binary-ours' into maint
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 8c4bcd34bd194d7932a153f464cbc6ada7b27b46)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 17061 git-blame.el
-rw-r--r-- 69926 git.el