Add builtin merge-file, a minimal replacement for RCS merge
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: ba1f5f3537)
-rw-r--r-- 356 Makefile
-rw-r--r-- 42759 git.el
-rw-r--r-- 5777 vc-git.el