Merge branch 'nd/list-merge-strategy' into next
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: a75d04a67532d21f43261716b4671b7095fa7535)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16995 git-blame.el
-rw-r--r-- 69857 git.el