Merge branch 'jc/merge-symlink-ours-theirs' into maint
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: ff19620f8127798dcfc1dab7c633eb7505b7abd3)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16995 git-blame.el
-rw-r--r-- 69857 git.el