"reset --merge": fix unmerged case
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: e11d7b5969704cd5ce39d053414d905bb203886b)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16908 git-blame.el
-rw-r--r-- 69689 git.el