git-revert with conflicts to behave as git-merge with conflicts
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: a9cb3c6ecb97c4734423045f47899e03f135d3bd)
-rw-r--r-- 356 Makefile
-rw-r--r-- 41114 git.el
-rw-r--r-- 5627 vc-git.el