Merge branch 'jc/maint-add-u-remove-conflicted'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: f39e4cfa2ec2bab4175cee3a9e806d8b65161c75)
-rw-r--r-- 408 Makefile
-rw-r--r-- 15566 git-blame.el
-rw-r--r-- 65487 git.el
-rw-r--r-- 8032 vc-git.el