Merge branch 'fc/rerere-conflict-style' into maint
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: ada8710e634b4f9f686bd0477bd92b272ec60801)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 17061 git-blame.el
-rw-r--r-- 69923 git.el