Merge branch 'jk/add-p-skip-conflicts'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 3c524002d67471f8ef5455ef0e5ce3e6fc846b32)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16931 git-blame.el
-rw-r--r-- 69926 git.el