Merge branch 'dp/merge-strategy-doc-fix'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: e2a37ec2b03456bc9131f7c1fe68e1742bf28953)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16995 git-blame.el
-rw-r--r-- 69857 git.el