Merge branch 'ph/mergetool'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 5e707b28d9ea0bebfef5aff977e3ccebd53aa045)
-rw-r--r-- 408 Makefile
-rw-r--r-- 15571 git-blame.el
-rw-r--r-- 64690 git.el
-rw-r--r-- 8032 vc-git.el