Merge branch 'cb/merge-recursive-fix'
[git/debian.git] / contrib / emacs / 
treeb0ba9eb0d948e16babc1e25782b02646215c978c
drwxr-xr-x   ..
-rw-r--r-- 6 .gitignore
-rw-r--r-- 408 Makefile
-rw-r--r-- 15566 git-blame.el
-rw-r--r-- 65487 git.el
-rw-r--r-- 8032 vc-git.el