Merge branch 'da/mergetool-delete-delete-conflict' into maint
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 517736ffcf7e0a81cef938987b4cc4ed82b3408f)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 17061 git-blame.el
-rw-r--r-- 69923 git.el