Merge branch 'ap/maint-merge-strategy-list-fix'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 22c4e72d6eef8295a3311f6eb2f82a5494f8b88e)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16908 git-blame.el
-rw-r--r-- 69689 git.el