Merge branch 'sp/mergetool'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 6959893b0b65ebc68ce2fb524a8ec15a26ca4972)
-rw-r--r-- 408 Makefile
-rw-r--r-- 15273 git-blame.el
-rw-r--r-- 55620 git.el
-rw-r--r-- 8032 vc-git.el