Merge branch 'nd/remote-plural-ours-plus-theirs'
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 17061 git-blame.el
-rw-r--r-- 69923 git.el