Revert "git-pull: refuse default merge without branch.*.merge"
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 9e11554917d391c18e043bc0b38ee0377e69568e)
-rw-r--r-- 356 Makefile
-rw-r--r-- 42759 git.el
-rw-r--r-- 5777 vc-git.el