Merge branch 'jc/better-conflict-resolution'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 9ba929ed652f5ed7707f1c684999af4ad02c4925)
-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