Merge branch 'ae/preservemerge'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: edacb101ef831cdc59d07015b1b5cd1aaddcc588)
-rw-r--r-- 408 Makefile
-rw-r--r-- 15566 git-blame.el
-rw-r--r-- 64730 git.el
-rw-r--r-- 8032 vc-git.el