do not overwrite untracked during merge from unborn branch
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 172b6428d06ff4eb0812f087a497d50b6c878fe1)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16908 git-blame.el
-rw-r--r-- 69689 git.el