Merge part of 'jc/diff' into next
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 213523f4)
-rw-r--r-- 37458 git.el