merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: c52ff85d97c698c902870305a010e2303e297b87)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16931 git-blame.el
-rw-r--r-- 69926 git.el