Merge branch 'jc/maint-combine-diff-pre-context' into maint
[git.git] / contrib / emacs / 
tree4d393963cfb8989b529bc01618b3e71155467166
drwxr-xr-x   ..
-rw-r--r-- 6 .gitignore
-rw-r--r-- 408 Makefile
-rw-r--r-- 15571 git-blame.el
-rw-r--r-- 64690 git.el
-rw-r--r-- 8032 vc-git.el