Merge branch 'nf/mergetool-prompt'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: b97414352746967c72e5b87cce39efea4b93e2bf)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 17061 git-blame.el
-rw-r--r-- 69923 git.el