t3508 (cherry-pick): futureproof against unmerged files
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 18c8ff46104302ea30e879a0f2cb5eefb94df1a4)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16908 git-blame.el
-rw-r--r-- 69689 git.el