Merge branch 'cb/mergetool'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 3827210b91a7d363ea67bcf0b9c6ee1c91d2f3c5)
-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