Merge branch 'wd/rebase-conflict-guide'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 076eeec8bec1df628717733fb16df6161d5ef7e5)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 17061 git-blame.el
-rw-r--r-- 69923 git.el