merge-recursive: fix remaining directory rename + dirty overwrite cases
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 18797a3b10e4077473740b953651b0032828d0fb)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16995 git-blame.el
-rw-r--r-- 69857 git.el