merge-recursive: add/add really is modify/modify with an empty base
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: f953831e030d3ece7346bdb5c4fde4fde43c925e)
-rw-r--r-- 356 Makefile
-rw-r--r-- 42759 git.el
-rw-r--r-- 5777 vc-git.el