Keep rename/rename conflicts of intermediate merges while doing recursive merge
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: a97e4075a16e0cbdf9c4aed736b5e762e035508b)
-rw-r--r-- 360 Makefile
-rw-r--r-- 13528 git-blame.el
-rw-r--r-- 47937 git.el
-rw-r--r-- 6245 vc-git.el