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