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