merge-recursive: Small cleanups for conflict_rename_rename_1to2
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: a99b7f2256ebd2d1db59c578f3da003e36f259c4)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16931 git-blame.el
-rw-r--r-- 69926 git.el