merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 2a669c341a857f53d946dec762e6f22a54b12dd2)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16908 git-blame.el
-rw-r--r-- 69689 git.el