merge-recursive: adjust to loosened "working file clobbered" check
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae)
-rw-r--r-- 356 Makefile
-rw-r--r-- 41114 git.el
-rw-r--r-- 5777 vc-git.el