merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16995 git-blame.el
-rw-r--r-- 69857 git.el