Merge branch 'jk/error-resolve-conflict-advice'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 17061 git-blame.el
-rw-r--r-- 69923 git.el