merge-file: support -p and -q; fix compile warnings
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: fbe0b24ca53111208b8ecd920cc112d0be13f93c)
-rw-r--r-- 356 Makefile
-rw-r--r-- 42759 git.el
-rw-r--r-- 5777 vc-git.el