Merge branch 'sm/show-superproject-while-conflicted' into maint
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 9674e7a333150d4f4a4752b25b4066bcd0406ddf)
-rw-r--r-- 1173 README
-rw-r--r-- 286 git-blame.el
-rw-r--r-- 374 git.el