Merge branch 'jc/conflict-marker-size'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 06dbc1ea5768618337bf11e5f64c4f9f14a68008)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16908 git-blame.el
-rw-r--r-- 69689 git.el